diff --git a/assets/javascripts/discourse/components/assign-actions-dropdown.js b/assets/javascripts/discourse/components/assign-actions-dropdown.js
index b022ecc..13ed9f7 100644
--- a/assets/javascripts/discourse/components/assign-actions-dropdown.js
+++ b/assets/javascripts/discourse/components/assign-actions-dropdown.js
@@ -40,15 +40,12 @@ export default class AssignActionsDropdown extends DropdownSelectBoxComponent {
       Object.entries(this.topic.indirectly_assigned_to).forEach((entry) => {
         const [postId, assignment_map] = entry;
         const assignee = assignment_map.assigned_to;
-        console.log("!!!!!!!!!!!!!!!!!!!");
         options = options.concat({
           id: `unassign_post_${postId}`,
           icon: assignee.username ? "user-xmark" : "group-times",
           name: i18n("discourse_assign.unassign_post.title"),
           description: i18n("discourse_assign.unassign_post.help", {
-            username: !siteSettings.prioritize_full_name_in_ux
-              ? assignee.username
-              : assignee.name,
+            username: assignee.username || assignee.name,
           }),
         });
       });
diff --git a/assets/javascripts/discourse/components/assigned-to-post.gjs b/assets/javascripts/discourse/components/assigned-to-post.gjs
index 6af28c9..c352e49 100644
--- a/assets/javascripts/discourse/components/assigned-to-post.gjs
+++ b/assets/javascripts/discourse/components/assigned-to-post.gjs
@@ -9,6 +9,7 @@ import DMenu from "float-kit/components/d-menu";
 
 export default class AssignedToPost extends Component {
   @service taskActions;
+  @service siteSettings;
 
   @action
   unassign() {
diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js b/assets/javascripts/discourse/initializers/extend-for-assigns.js
index 52fcbba..b6515c5 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -485,10 +485,6 @@ function initialize(api) {
               ? `href="${getURL(assignedPath)}" data-auto-route="true"`
               : "";
 
-          const name = !siteSettings.prioritize_full_name_in_ux
-            ? assignee.username
-            : assignee.name;
-
           return `<${tagName} class="assigned-to discourse-tag simple" ${href}>${icon}<span title="${escapeExpression(
             note
           )}">${name}</span></${tagName}>`;
@@ -568,6 +564,10 @@ function initialize(api) {
       ];
       const assigneeElements = [];
 
+      const nameOrUsername = siteSettings.prioritize_full_name_in_ux
+        ? assignedToUser.name
+        : assignedToUser.username;
+
       const assignedHtml = (username, path, type) => {
         return `<span class="assigned-to--${type}">${htmlSafe(
           i18n("discourse_assign.assigned_topic_to", {
@@ -583,7 +583,7 @@ function initialize(api) {
             "span.assignee",
             new RawHtml({
               html: assignedHtml(
-                assignedToUser.username,
+                nameOrUsername,
                 assignedToUserPath(assignedToUser),
                 "user"
               ),