diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 6c2fd2fc50d..61cacc69f1c 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -13,7 +13,7 @@
     </ul>
   </div>
   <div class='username controls'>
-    {{text-field value=username placeholderKey="username"}}
+    {{text-field value=username placeholderKey="search_hint"}}
   </div>
 </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a002f36aeee..9e735b1ed74 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -488,6 +488,7 @@ en:
     last_seen: 'Seen'
     created: 'Created'
     trust_level: 'Trust Level'
+    search_hint: 'Username or email'
 
     create_account:
       title: "Create New Account"