diff --git a/app/assets/javascripts/discourse/app/components/user-info.js b/app/assets/javascripts/discourse/app/components/user-info.js
index a16b8875a4b..024825ed78a 100644
--- a/app/assets/javascripts/discourse/app/components/user-info.js
+++ b/app/assets/javascripts/discourse/app/components/user-info.js
@@ -2,6 +2,7 @@ import Component from "@ember/component";
 import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { userPath } from "discourse/lib/url";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export function normalize(name) {
   return name.replace(/[\-\_ \.]/g, "").toLowerCase();
@@ -24,4 +25,9 @@ export default Component.extend({
       return name;
     }
   },
+
+  @discourseComputed("user.name")
+  nameFirst(name) {
+    return prioritizeNameInUx(name);
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
index ced515393c9..6de329c3a5a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
@@ -13,8 +13,8 @@
 
 <div class="user-detail">
   <div class="name-line">
-    <span class="username"><a href={{this.userPath}} data-user-card={{@user.username}}>{{format-username @user.username}}</a></span>
-    <span class="name">{{this.name}}</span>
+    <span class={{if nameFirst "name bold" "username bold"}}><a href={{this.userPath}} data-user-card={{@user.username}}>{{if nameFirst this.name (format-username @user.username)}}</a></span>
+    <span class={{if nameFirst "username margin" "name margin"}}><a href={{this.userPath}} data-user-card={{@user.username}}>{{if nameFirst (format-username @user.username) this.name}}</a></span>
     {{plugin-outlet name="after-user-name" connectorTagName="span" args=(hash user=user)}}
   </div>
   <div class="title">{{@user.title}}</div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
index 08310e75800..3c91365f64a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
@@ -91,7 +91,7 @@ acceptance("Group Requests", function (needs) {
         .text()
         .trim()
         .replace(/\s+/g, " "),
-      "eviltrout Robin Ward"
+      "Robin Ward eviltrout"
     );
     assert.equal(
       queryAll(".group-members tr:first-child td:nth-child(3)").text().trim(),
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index bbe8757af6f..9f9564657db 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -74,7 +74,7 @@
   .me {
     background-color: var(--highlight-low-or-medium);
     .username a,
-    .name,
+    .name a,
     .title,
     .number,
     .time-read {
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index dcb26e786b6..bd7f95d423b 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -27,13 +27,16 @@
       @include ellipsis;
     }
 
-    .username a {
+    .bold a {
       font-weight: bold;
-      color: var(--primary-high-or-secondary-low);
     }
 
-    .name {
+    .margin a {
       margin-left: 5px;
+    }
+
+    .name a,
+    .username a {
       color: var(--primary-high-or-secondary-low);
     }
 
@@ -62,7 +65,7 @@
       display: block;
     }
 
-    .name {
+    .margin a {
       margin-left: 0;
     }