diff --git a/templates/admin/paneltorrentedit.jet.html b/templates/admin/paneltorrentedit.jet.html
index bf491e9e..42ed3863 100644
--- a/templates/admin/paneltorrentedit.jet.html
+++ b/templates/admin/paneltorrentedit.jet.html
@@ -25,7 +25,7 @@
           <div name="language" class="form-input language">
               {{ range _, language := GetTorrentLanguages() }}
               <input type="checkbox" name="lang-{{ language }}" id="lang-{{ language }}">
-              <label for="lang-{{ language }}" class="flag flag-{{ language }}" title="{{LanguageName(language, T)}}"></label>
+              <label for="lang-{{ language }}" class="flag flag-{{ FlagCode(language) }}" title="{{LanguageName(language, T)}}"></label>
               {{ end }}
           </div>
       </div>
diff --git a/templates/layouts/partials/helpers/badgemenu.jet.html b/templates/layouts/partials/helpers/badgemenu.jet.html
index 4ec5af7a..8500861a 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 }}
+			{{if User.ID > 0 }}
 			<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>
diff --git a/templates/site/torrents/edit.jet.html b/templates/site/torrents/edit.jet.html
index ef2f3dc4..cd56dfcc 100644
--- a/templates/site/torrents/edit.jet.html
+++ b/templates/site/torrents/edit.jet.html
@@ -30,7 +30,7 @@
           <div name="language" class="form-input language">
 			{{ range _, language := GetTorrentLanguages() }}
               <input type="checkbox" name="lang-{{ language }}" id="lang-{{ language }}">
-              <label for="lang-{{ language }}" class="flag flag-{{ language }}" title="{{LanguageName(language, T)}}"></label>
+              <label for="lang-{{ language }}" class="flag flag-{{ FlagCode(language) }}" title="{{LanguageName(language, T)}}"></label>
 			{{ end }}
 		  </div>
           {{ yield errors(name="language")}}
diff --git a/templates/site/torrents/upload.jet.html b/templates/site/torrents/upload.jet.html
index fd14cd36..d2adb637 100644
--- a/templates/site/torrents/upload.jet.html
+++ b/templates/site/torrents/upload.jet.html
@@ -36,7 +36,7 @@
 		<div name="language" class="form-input language">
 			{{ range _, language := GetTorrentLanguages() }}
 			<input type="checkbox" name="lang-{{ language }}" id="lang-{{ language }}">
-			<label for="lang-{{ language }}" class="flag flag-{{ language }}" title="{{LanguageName(language, T)}}"></label>
+			<label for="lang-{{ language }}" class="flag flag-{{ FlagCode(language) }}" title="{{LanguageName(language, T)}}"></label>
 			{{ end }}
 		</div>
 		{{ yield errors(name="language")}}