diff --git a/templates/site/torrents/listing.jet.html b/templates/site/torrents/listing.jet.html
index e60d3cde..0c5d42b7 100644
--- a/templates/site/torrents/listing.jet.html
+++ b/templates/site/torrents/listing.jet.html
@@ -54,8 +54,8 @@
               <div class="nyaa-cat nyaa-cat-{{ .SubCategory}}">
 			  {{end}}
                   <a href="{{ URL.Parse("/search?c="+.Category+"_"+ .SubCategory) }}" title="{{ T(CategoryName(.Category, .SubCategory)) }}">
-              {{if FlagCode(.Language) != ""}}
-                  <img src="img/blank.gif" alt="{{ LanguageName(.Language, T) }}" class="flag flag-{{FlagCode(.Language)}}" title="{{ LanguageName(.Language, T) }}">
+              {{if len(.Languages) == 1 }}
+                  <img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{FlagCode(.Language[0])}}" title="{{ LanguageName(.Language[0], T) }}">
               {{end}}
                   </a>
               </div>
diff --git a/utils/cookies/user.go b/utils/cookies/user.go
index 42a37a40..7b4cd5c5 100644
--- a/utils/cookies/user.go
+++ b/utils/cookies/user.go
@@ -34,9 +34,9 @@ func NewCurrentUserRetriever() *CurrentUserRetriever {
 type CurrentUserRetriever struct{}
 
 // RetrieveCurrentUser retrieve current user for languages
-func (*CurrentUserRetriever) RetrieveCurrentUser(c *gin.Context) (models.User, error) {
+func (*CurrentUserRetriever) RetrieveCurrentUser(c *gin.Context) (*models.User, error) {
 	user, _, err := CurrentUser(c)
-	return *user, err
+	return user, err
 }
 
 // CreateUserAuthentication creates user authentication.
diff --git a/utils/publicSettings/publicSettings.go b/utils/publicSettings/publicSettings.go
index c2ce6dae..0887ffe0 100644
--- a/utils/publicSettings/publicSettings.go
+++ b/utils/publicSettings/publicSettings.go
@@ -16,7 +16,7 @@ import (
 
 // UserRetriever : this interface is required to prevent a cyclic import between the languages and userService package.
 type UserRetriever interface {
-	RetrieveCurrentUser(c *gin.Context) (models.User, error)
+	RetrieveCurrentUser(c *gin.Context) (*models.User, error)
 }
 
 // TemplateTfunc : T func used in template
@@ -175,9 +175,9 @@ func GetMascotUrlFromRequest(c *gin.Context) string {
 	return ""
 }
 
-func getCurrentUser(c *gin.Context) (models.User, error) {
+func getCurrentUser(c *gin.Context) (*models.User, error) {
 	if userRetriever == nil {
-		return models.User{}, errors.New("failed to get current user: no user retriever set")
+		return &models.User{}, errors.New("failed to get current user: no user retriever set")
 	}
 	return userRetriever.RetrieveCurrentUser(c)
 }