diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 6239e883857..0ccaee02513 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,8 +53,11 @@
                 {{avatar user imageSize="small"}}
               </a>
             </td>
-            <td>
+            <td class="username">
               {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
+              {{#if user.staged}}
+                {{d-icon "envelope-o" title="user.staged" }}
+              {{/if}}
             </td>
             <td class='email'>
               {{unbound user.email}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 02ee31c9bd1..f8e03231290 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -31,7 +31,7 @@
           <h2>{{user.title}}</h2>
         {{/if}}
 
-        {{#if showCheckEmail}}
+        {{#if user.staged}}
           <h2 class="staged">{{i18n 'user.staged'}}</h2>
         {{/if}}
 
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index e793f1e493e..9926a73a996 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -176,6 +176,12 @@ $mobile-breakpoint: 700px;
   }
 }
 
+.admin-users .users-list {
+  .username .fa {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
+
 .ip-lookup {
   position: relative;
   display: inline-block;
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index 90471d529bf..a9e0bf47cd9 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -36,7 +36,8 @@ class AdminUserListSerializer < BasicUserSerializer
 
   def include_email?
     # staff members can always see their email
-    (scope.is_staff? && object.id == scope.user.id) || scope.can_see_emails?
+    (scope.is_staff? && object.id == scope.user.id) || scope.can_see_emails? ||
+      (scope.is_staff? && object.staged?)
   end
 
   alias_method :include_associated_accounts?, :include_email?
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 82a8dcb2b92..30bb1038c6f 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -141,7 +141,8 @@ class UserSerializer < BasicUserSerializer
   end
 
   def include_email?
-    object.id && object.id == scope.user.try(:id)
+    (object.id && object.id == scope.user.try(:id)) ||
+      (scope.is_staff? && object.staged?)
   end
 
   def can_change_bio