diff --git a/assets/javascripts/discourse/templates/components/assignee-chooser-row.hbs b/assets/javascripts/discourse/templates/components/assignee-chooser-row.hbs
index 967e4eb..cd57b55 100644
--- a/assets/javascripts/discourse/templates/components/assignee-chooser-row.hbs
+++ b/assets/javascripts/discourse/templates/components/assignee-chooser-row.hbs
@@ -1,15 +1,22 @@
 {{#if this.item.isUser}}
   {{avatar this.item imageSize="tiny"}}
-  <span class="identifier">{{format-username this.item.id}}</span>
-  <span class="name">{{this.item.name}}</span>
-  {{#if (and this.item.showUserStatus this.item.status)}}
-    <UserStatusMessage @status={{this.item.status}} @showDescription={{true}} />
-  {{/if}}
+  <div class="user-wrapper">
+    <span class="identifier">{{format-username this.item.id}}</span>
+    <span class="name">{{this.item.name}}</span>
+    {{#if (and this.item.showUserStatus this.item.status)}}
+      <UserStatusMessage
+        @status={{this.item.status}}
+        @showDescription={{true}}
+      />
+    {{/if}}
+  </div>
   {{decorate-username-selector this.item.id}}
 {{else if this.item.isGroup}}
   {{d-icon "users"}}
-  <span class="identifier">{{this.item.id}}</span>
-  <span class="name">{{this.item.full_name}}</span>
+  <div class="user-wrapper">
+    <span class="identifier">{{this.item.id}}</span>
+    <span class="name">{{this.item.full_name}}</span>
+  </div>
 {{else}}
   {{d-icon "envelope"}}
   <span class="identifier">{{this.item.id}}</span>
diff --git a/assets/stylesheets/assigns.scss b/assets/stylesheets/assigns.scss
index cf18c45..38ac338 100644
--- a/assets/stylesheets/assigns.scss
+++ b/assets/stylesheets/assigns.scss
@@ -87,6 +87,12 @@
       color: var(--primary-medium);
     }
 
+    .user-wrapper {
+      display: flex;
+      align-items: flex-end;
+      line-height: var(--line-height-small);
+    }
+
     .name {
       display: contents;
     }
@@ -96,23 +102,23 @@
     }
 
     .user-status-message {
-      color: var(--primary-medium);
       font-size: var(--font-down-2);
       margin-left: 0.5em;
 
       .emoji {
-        height: var(--font-up-1);
-        width: var(--font-up-1);
+        height: var(--font-0);
+        width: var(--font-0);
       }
     }
 
     .suggestions-label {
+      position: absolute;
+      right: 0;
+      top: 0;
+      margin: 0.25em 0.25em 0 0;
       color: var(--primary-low-mid);
-      font-size: var(--font-down-2);
+      font-size: var(--font-down-3);
       font-weight: bold;
-      margin-left: auto;
-      margin-right: -0.25em;
-      margin-top: -1em;
       text-transform: uppercase;
     }
   }