diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 2e8212f3e43..5c5d1b321ab 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -22,19 +22,21 @@
       {{#unless userDeleted}}
         <div {{bind-attr class=":contents byTopicCreator:topic-creator :trigger-expansion"}}>
           <a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a>
-          <h3 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{{breakUp username name}}}</a></h3>
+          <div class="names">
+            <h3 {{bind-attr class="staff new_user :username"}}><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{{breakUp username name}}}</a></h3>
 
-          {{#if showName}}
-          <h3 class="full-name"><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3>
-          {{/if}}
-
-          {{#if user_title}}
-            {{#if primary_group_name}}
-              <div class="user-title"><a href='/groups/{{unbound primary_group_name}}' class='user-group'>{{unbound user_title}}</a></div>
-            {{else}}
-              <div class="user-title" {{action showPosterExpansion this}}>{{unbound user_title}}</div>
+            {{#if showName}}
+            <h3 class="full-name"><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3>
             {{/if}}
-          {{/if}}
+
+            {{#if user_title}}
+              {{#if primary_group_name}}
+                <div class="user-title"><a href='/groups/{{unbound primary_group_name}}' class='user-group'>{{unbound user_title}}</a></div>
+              {{else}}
+                <div class="user-title" {{action showPosterExpansion this}}>{{unbound user_title}}</div>
+              {{/if}}
+            {{/if}}
+          </div>
         </div>
       {{else}}
         <div class="contents">
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 6b08d471ae0..61666c25968 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -60,10 +60,10 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
   background: $primary_background_color;
   color: $secondary_text_color;
   @include medium-width {
-  left: 107px;
+    left: 107px;
   }
   @include small-width {
-  left: 103px;
+    left: 103px;
   }
 }
 
@@ -801,6 +801,7 @@ blockquote { /* solo quotes */
 .row:before, .row:after {display: table; content: "";}
 .row:after {clear: both;}
 
+
 .embedded-posts {
   h1, h2, h3 {margin: 10px 0;}
   a.mention {background: lighten($secondary_background_color, 70%);}
@@ -998,7 +999,7 @@ blockquote { /* solo quotes */
       }
     }
   }
- article.boxed {
+  article.boxed {
     position: relative;
     line-height: 21px;
 
@@ -1015,7 +1016,6 @@ blockquote { /* solo quotes */
         border-bottom: 1px solid $primary_border_color;
         border-right: 1px solid $primary_border_color;
         color: $secondary_text_color;
-
       }
     }
   }