diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 4230f74..6abf32b 100755
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -57,7 +57,8 @@
 					</button>
 					<a class="navbar-brand" href="/">{{ config.SITE_NAME }}</a>
 				</div>
-				{% set search_placeholder = 'Search {}\'s torrents...'.format(user.username) if user_page else 'Search...' %}
+				{% set search_username = (user.username + ("'" if user.username[-1] == 's' else "'s")) if user_page else None %}
+				{% set search_placeholder = 'Search {} torrents...'.format(search_username) if user_page else 'Search...' %}
 				<div id="navbar" class="navbar-collapse collapse">
 					<ul class="nav navbar-nav">
 						<li {% if request.path == "/upload" %} class="active"{% endif %}><a href="/upload">Upload</a></li>
diff --git a/nyaa/templates/user.html b/nyaa/templates/user.html
index 5f7306a..34c0cbe 100644
--- a/nyaa/templates/user.html
+++ b/nyaa/templates/user.html
@@ -41,7 +41,7 @@
 {% endif %}
 
 <h3>
-    Browsing <span class="text-{{ user.userlevel_color }}">{{ user.username }}</span>'s torrents
+    Browsing <span class="text-{{ user.userlevel_color }}">{{ user.username }}</span>'{{ '' if user.username[-1] == 's' else 's' }} torrents
 </h3>
 
 {% include "search_results.html" %}