diff --git a/templates/_badgemenu.html b/templates/_badgemenu.html
index 301875ce..8dbdd136 100644
--- a/templates/_badgemenu.html
+++ b/templates/_badgemenu.html
@@ -8,13 +8,13 @@
 		    <ul class="dropdown-menu">
 		        <li><a href="{{ genRoute "user_profile" "id" (print .Id) "username" .Username }}"><i class="fa fa-cog"></i> Profile</a></li>
 		        <li class="divider"></li>
-		        <li><a href="{{ genRoute "user_logout" }}"><i class="fa fa-sign-out"></i> Sign-out</a></li>
+		        <li><a href="{{ genRoute "user_logout" }}"><i class="fa fa-sign-out"></i> {{ T "sign_out"}}</a></li>
 		    </ul>
 		    {{ else }}
-            <a href="#" class="dropdown-toggle profile-image" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Member<span class="caret"></span></a>
+            <a href="#" class="dropdown-toggle profile-image" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ T "member" }}<span class="caret"></span></a>
             <ul class="dropdown-menu">
-                <li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> Sign in</a></li>
-                <li><a href="{{ genRoute "user_register" }}"><i class="fa fa-cog"></i> Sign Up</a></li>
+                <li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> {{ T "sign_in"}}</a></li>
+                <li><a href="{{ genRoute "user_register" }}"><i class="fa fa-cog"></i> {{ T "sign_up"}}</a></li>
             </ul>
 	{{end}}
 		</li>
diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html
index ccbcd29b..d5518975 100644
--- a/templates/_user_list_torrents.html
+++ b/templates/_user_list_torrents.html
@@ -1,5 +1,6 @@
 {{define "profile_content"}}
 {{with .UserProfile}}
+{{ if gt (len .ListTorrents) 0 }}
       <div class="table-responsive">
           <table class="table custom-table-hover">
           <tr>
@@ -44,5 +45,8 @@
           </ul>
       </nav>
     </div>
+    {{else}}
+     <h2 style="text-align: center;">{{ T "no_torrents_uploaded" }}</h2>
+{{end}}
 {{end}}
 {{end}}
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
index 0a0bd08a..ee7a72fc 100644
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@@ -179,6 +179,10 @@
     "id": "404_not_found",
     "translation": "404 Not Found"
   },
+  {
+    "id": "no_torrents_uploaded",
+    "translation": "No torrents uploaded yet!"
+  },
   {
     "id": "profile",
     "translation": "Profile"