diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index dd44c335a..b6f3cbb28 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -28,8 +28,13 @@
           <h3 class="full-name"><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3>
           {{/if}}
 
-          {{#if user_title}}<div class="user-title" {{action showPosterExpansion this}}>{{user_title}}</div>{{/if}}
-          {{#if primary_group_name}}<div><a href='/groups/{{unbound primary_group_name}}' class='user-group'>{{unbound primary_group_name}}</a></div>{{/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>
       {{else}}
         <div class="contents">
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 299a16d28..45656dc92 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -473,12 +473,8 @@ iframe {
     }
 
     a.user-group {
-      margin: 4px 0 0 0;
-      padding: 0px;
       color: $primary_light;
-      font-size: 80%;
       width: 100%;
-      line-height: 13px;
     }
 
     h3 a {