diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index 7976d5b5d1..7a5ddbd78f 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -1,20 +1,17 @@
-import registerUnbound from 'discourse/helpers/register-unbound';
+import { iconHTML } from 'discourse/helpers/fa-icon';
 
 const Safe = Handlebars.SafeString;
 
-registerUnbound('user-status', function(user) {
+export default Ember.Handlebars.makeBoundHelper(function(user, args) {
   if (!user) { return; }
 
-  var name = Handlebars.Utils.escapeExpression(user.get('name'));
+  const name = Handlebars.Utils.escapeExpression(user.get('name'));
+  const currentUser = args.hash.currentUser;
 
-  if(Discourse.User.currentProp("admin") || Discourse.User.currentProp("moderator")) {
-    if(user.get('admin')) {
-      var adminDesc = I18n.t('user.admin', {user: name});
-      return new Safe('<i class="fa fa-shield" title="' + adminDesc +  '" alt="' + adminDesc + '"></i>');
-    }
+  if (currentUser && user.get('admin') && currentUser.get('staff')) {
+    return new Safe(iconHTML('shield', { label: I18n.t('user.admin', { user: name }) }));
   }
-  if(user.get('moderator')){
-    var modDesc = I18n.t('user.moderator', {user: name});
-    return new Safe('<i class="fa fa-shield" title="' + modDesc +  '" alt="' + modDesc + '"></i>');
+  if (user.get('moderator')) {
+    return new Safe(iconHTML('shield', { label: I18n.t('user.moderator', { user: name }) }));
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index 588da54eb0..bcf0013c18 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -5,7 +5,7 @@
   <div class="names">
     <span>
       <h1 {{bind-attr class="staff new_user"}}>
-        {{#link-to 'user' user}}{{username}} {{user-status user}}{{/link-to}}
+        {{#link-to 'user' user}}{{username}} {{user-status user currentUser=currentUser}}{{/link-to}}
       </h1>
 
       {{#if user.name}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index a61f127d3f..8fdb0ceeab 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -61,7 +61,7 @@
           </section>
 
           <div class="primary-textual">
-            <h1>{{username}} {{user-status model}}</h1>
+            <h1>{{username}} {{user-status model currentUser=currentUser}}</h1>
             <h2>{{name}}</h2>
             {{#if title}}
               <h3>{{title}}</h3>