diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
index cf6319cbeba..cda261593d2 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
@@ -5,7 +5,7 @@
         <div>
           <a href='/users/{{unbound username}}'>{{avatar this imageSize="small"}}</a>
         </div>
-        <h5><a href='/users/{{unbound username}}'>{{username}}</a></h5>
+        <h5 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h5>
         <span class='post-date'>{{date created_at}}</span>
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 47a823a6287..2ec818c61de 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -29,7 +29,7 @@
     <div class='topic-meta-data span2'>
       <div {{bindAttr class=":contents byTopicCreator:topic-creator"}}>
         <a href='{{unbound usernameUrl}}'>{{avatar this imageSize="large"}}</a>
-        <h3 {{bindAttr class="moderator new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h3>
+        <h3 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h3>
 
         <div class='post-info'>
           <a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 5420671ca5f..91e21b45b1d 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -347,7 +347,7 @@
         line-height: 18px;
       }
 
-      h3.moderator a {
+      .staff a {
         background-color: #ffe;
         border: 1px solid #ffd;
       }
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 1c9efb37727..c0c00479bcf 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -38,12 +38,13 @@ class PostSerializer < ApplicationSerializer
              :raw,
              :actions_summary,
              :moderator?,
+             :staff?,
              :avatar_template,
              :user_id,
              :draft_sequence,
              :hidden,
              :hidden_reason_id,
-             :deleted_at, 
+             :deleted_at,
              :trust_level
 
 
@@ -51,6 +52,10 @@ class PostSerializer < ApplicationSerializer
     object.user.moderator?
   end
 
+  def staff?
+    object.user.staff?
+  end
+
   def avatar_template
     object.user.avatar_template
   end