diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index c26eae71631..5ddaddd4a64 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -83,12 +83,12 @@
     <table class="table table-condensed table-hover">
       <tbody>
         <tr>
-          <td class="title"><i class='icon icon-trophy'></i> {{i18n admin.dashboard.moderators}}</td>
-          <td class="value">{{moderators}}</td>
+          <td class="title"><i class='icon icon-trophy'></i> {{i18n admin.dashboard.admins}}</td>
+          <td class="value">{{admins}}</td>
         </tr>
         <tr>
-          <td class="title"><i class='icon icon-magic'></i> {{i18n admin.dashboard.admins}}</td>
-          <td class="value">{{admins}}</td>
+          <td class="title"><i class='icon icon-magic'></i> {{i18n admin.dashboard.moderators}}</td>
+          <td class="value">{{moderators}}</td>
         </tr>
       </tbody>
     </table>
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 3f3943bd767..7d8e4483de4 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -72,7 +72,10 @@
           {{/if}}
         </td>
         {{/if}}
-        <td>{{#if admin}}<i class="icon-trophy" title="{{i18n admin.title}}"></i>{{/if}}<td>
+        <td>
+          {{#if admin}}<i class="icon-trophy" title="{{i18n admin.title}}"></i>{{/if}}
+          {{#if moderator}}<i class="icon-magic" title="{{i18n admin.moderator}}"></i>{{/if}}
+        <td>
       </tr>
     {{/each}}
 
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 3b881773cc5..768154a69e0 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -416,7 +416,7 @@ table {
   }
 
   &.totals {
-    width: 160px;
+    width: 185px;
     margin-top: 0px;
 
     table td {
diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb
index 3b1f734bc03..dc13d502081 100644
--- a/app/serializers/admin_user_serializer.rb
+++ b/app/serializers/admin_user_serializer.rb
@@ -3,6 +3,7 @@ class AdminUserSerializer < BasicUserSerializer
   attributes :email,
              :active,
              :admin,
+             :moderator,
              :last_seen_age,
              :days_visited,
              :last_emailed_age,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f367e8b550c..6fb281a274a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -787,6 +787,7 @@ en:
 
     admin:
       title: 'Discourse Admin'
+      moderator: 'Moderator'
 
       dashboard:
         title: "Admin Dashboard"