diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6
index 4331af9d93a..d9b7c32595d 100644
--- a/app/assets/javascripts/discourse/components/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/components/poster-name.js.es6
@@ -83,10 +83,7 @@ var PosterNameComponent = Em.Component.extend({
   posterGlyph: function(post) {
     var desc;
 
-    if(post.get('admin')) {
-      desc = I18n.t('user.admin_tooltip');
-      return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
-    } else if(post.get('moderator')) {
+    if(post.get('moderator')) {
       desc = I18n.t('user.moderator_tooltip');
       return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
     }
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 4ac435769f9..dcd64e7cb2a 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -79,9 +79,11 @@ Discourse.User = Discourse.Model.extend({
     var name = Handlebars.Utils.escapeExpression(this.get('name')),
         desc;
 
-    if(this.get('admin')) {
-      desc = I18n.t('user.admin', {user: name});
-      return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
+    if(Discourse.User.currentProp("admin") || Discourse.User.currentProp("moderator")) {
+      if(this.get('admin')) {
+        desc = I18n.t('user.admin', {user: name});
+        return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
+      }
     }
     if(this.get('moderator')){
       desc = I18n.t('user.moderator', {user: name});