diff --git a/templates/layouts/partials/helpers/badgemenu.jet.html b/templates/layouts/partials/helpers/badgemenu.jet.html
index 89e5f966..4ec5af7a 100644
--- a/templates/layouts/partials/helpers/badgemenu.jet.html
+++ b/templates/layouts/partials/helpers/badgemenu.jet.html
@@ -1,7 +1,7 @@
 {{ import "csrf" }}
 {{block badge_user()}}
 <div class="h-user">
-			{{if User.ID > 0}}
+			{{if User }}
 			<button href="#" class="nav-btn">
 			<div class="user-avatar small"><img src="https://www.gravatar.com/avatar/{{ User.MD5 }}?s=50"></div> 
 			<span class="user-info" title="{{ User.Username}}"><span class="hide-md">{{User.Username}}</span></span>
@@ -10,7 +10,7 @@
 					<a class="nav-btn" href="/user/{{ User.ID }}/{{ User.Username }}">{{ T("profile")}}</a>
 					<a class="nav-btn" href="/notifications">{{  T("my_notifications")}} <span class="badge">({{ User.GetUnreadNotifications() }})</span></a>
 					<a class="nav-btn" href="/user/{{ User.ID }}/{{ User.Username }}/edit">{{ T("settings")}}</a>
-					{{if User.HasAdmin()}}<a class="nav-btn" href="/mod">{{ T("moderation")}}</a>{{end}}
+					{{if User && User.HasAdmin}}<a class="nav-btn" href="/mod">{{ T("moderation")}}</a>{{end}}
 					<form action="/logout" method="POST">{{ yield csrf_field() }}<input class="nav-btn" type="submit" name="logout" value="{{  T("sign_out")}}"></form>
 			</div>
 			{{ else }}
diff --git a/templates/site/torrents/listing.jet.html b/templates/site/torrents/listing.jet.html
index 0c5d42b7..b6c5292c 100644
--- a/templates/site/torrents/listing.jet.html
+++ b/templates/site/torrents/listing.jet.html
@@ -1,7 +1,7 @@
 {{ extends "layouts/index_site" }}
 {{ import "layouts/partials/helpers/search" }}
 {{block title()}}{{ T("home")}}{{end}}
-{{block contclass()}}{{if User.HasAdmin() }}content-admin{{end}}{{end}}
+{{block contclass()}}{{if User && User.HasAdmin() }}content-admin{{end}}{{end}}
 {{block additional_header()}}
 <link rel="stylesheet" href="/css/flags/flags.min.css">
 <link rel="stylesheet" href="/css/flags/custom_flags.css">
@@ -15,7 +15,7 @@
           <table>
           <thead class="torrent-info">
           <tr>
-              {{ if User.HasAdmin() }}
+              {{ if User && User.HasAdmin }}
               <th class="tr-cb hide"><input type="checkbox" name="select_all" onchange="TorrentsMod.selectAll(this.checked)"></th>
               {{end}}
               <th class="tr-cat">{{ T("category")}}</th>
@@ -42,7 +42,7 @@
           <tbody id="torrentListResults">
           {{ range Models}}
           <tr id="torrent_{{ .ID }}" class="torrent-info {{if .Status == 2}}remake{{else if .Status == 3}}trusted{{else if .Status == 4}}aplus{{end}}" >
-                {{ if User.HasAdmin() }}
+                {{ if User && User.HasAdmin }}
               <td class="tr-cb hide">
                 <input data-name="{{ .Name }}" type="checkbox" id="torrent_cb_{{ .ID }}" name="torrent_id" value="{{ .ID }}">
               </td>
@@ -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 len(.Languages) == 1 }}
-                  <img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{FlagCode(.Language[0])}}" title="{{ LanguageName(.Language[0], T) }}">
+              {{if len(.Languages) == 1 && .Languages[0] != "" }}
+                  <img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{FlagCode(.Languages[0])}}" title="{{ LanguageName(.Languages[0], T) }}">
               {{end}}
                   </a>
               </div>
@@ -96,7 +96,7 @@
           </tbody>
       </table>
     </div>
-    {{ if User.HasAdmin() }}
+    {{ if User && User.HasAdmin }}
     <div class="modtools">
         <button id="show_actions" class="form-input" data-toggle-text="{{ T("hide_mod_tools")}}">{{ T("show_mod_tools")}}</button>
         <span class="actions">
@@ -159,7 +159,7 @@
 <script type="text/javascript" src="{{ URL.Parse("/js/query.js") }}"></script>
 <script type="text/javascript" src="{{ URL.Parse("/js/modal.js") }}"></script>
 <script type="text/javascript" src="{{ URL.Parse("/js/torrents.js") }}"></script>
-{{ if User.HasAdmin() }}
+{{ if User && User.HasAdmin }}
 <script type="text/javascript" src="{{ URL.Parse("/js/translation.js") }}"></script>
 <script type="text/javascript" src="{{ URL.Parse("/js/torrentsMod.js") }}"></script>
     <script type="text/javascript">
@@ -228,7 +228,7 @@
     <script type="text/javascript">
         Templates.Add("torrents.item", function(torrent) {
             return "<tr id=\"torrent_" + torrent.id + "\" class=\"torrent-info"+ ((torrent.status == 2) ? " remake" : ((torrent.status == 3) ? " trusted" : ((torrent.status == 3) ? " aplus" : "" )))+"\">"+
-            {{ if User.HasAdmin() }}
+            {{ if User && User.HasAdmin }}
               "<td class=\"tr-cb\""+ ((TorrentsMod.enabled) ? "style=\"display:table-cell;\"" : "") +">"+
                 "<input data-name=\""+Templates.EncodeEntities(torrent.name)+"\" type=\"checkbox\" id=\"torrent_cb_"+torrent.id+"\" name=\"torrent_id\" value=\""+torrent.id+"\">"+
               "</td>"+
diff --git a/templates/site/torrents/view.jet.html b/templates/site/torrents/view.jet.html
index 6f6a82ab..21d322a5 100644
--- a/templates/site/torrents/view.jet.html
+++ b/templates/site/torrents/view.jet.html
@@ -52,7 +52,7 @@
   {{end}}
   {{ if User.ID > 0}}
   <a id="reportPopup" href="#" class="form-input">{{  T("report_btn") }}</a>
-    {{ if User.HasAdmin()}}
+    {{ if User && User.HasAdmin}}
     <a href="/mod/torrent/delete?id={{ Torrent.ID }}" class="form-input btn-red" onclick="if (!confirm('{{  T("are_you_sure") }}')) return false;">{{  T("delete") }}</a>
     <a href="/mod/torrent?id={{ Torrent.ID }}" class="form-input btn-orange">{{  T("edit") }}</a>
     {{ else if User.CurrentUserIdentical(Torrent.UploaderID) }}
diff --git a/templates/site/user/edit.jet.html b/templates/site/user/edit.jet.html
index e1e6040d..130d3d9e 100644
--- a/templates/site/user/edit.jet.html
+++ b/templates/site/user/edit.jet.html
@@ -123,7 +123,7 @@
 			</select> <br>
 		{{ yield errors(name="followed_email")}}
 		{{end}}
-		{{ if User.HasAdmin()}}
+		{{ if User && User.HasAdmin}}
 		<h3>{{  T("moderation")}}</h3>
 		<label class="input-label">{{  T("username")}}:</label> <br>
 			<input class="form-input up-input" name="username" id="username" type="text" value="{{UserProfile.Username}}">