diff --git a/CHANGELOG-nightly.md b/CHANGELOG-nightly.md
index 5e304946..486126de 100644
--- a/CHANGELOG-nightly.md
+++ b/CHANGELOG-nightly.md
@@ -1,3 +1,7 @@
+### 3.1.15.2000
+
+-   Fixed an issue causing international names to display for mentions
+
 ### 3.1.15.1000
 
 -   Added required Firefox built-in consent metadata to the manifest
diff --git a/src/app/chat/MessageTokenMention.vue b/src/app/chat/MessageTokenMention.vue
index 63ee0734..0d1c981e 100644
--- a/src/app/chat/MessageTokenMention.vue
+++ b/src/app/chat/MessageTokenMention.vue
@@ -12,6 +12,7 @@
 			is-mention
 			:hide-at="!hasAt"
 			hide-badges
+			hide-intl
 		/>
 	</span>
 </template>
diff --git a/src/app/chat/UserTag.vue b/src/app/chat/UserTag.vue
index 64dd74b3..e53b1162 100644
--- a/src/app/chat/UserTag.vue
+++ b/src/app/chat/UserTag.vue
@@ -47,7 +47,9 @@
 			<span v-cosmetic-paint="shouldPaint ? paint!.id : null">
 				<span v-if="isMention && !hideAt">@</span>
 				<span>{{ user.displayName }}</span>
-				<span v-if="user.intl"> ({{ user.username }})</span>
+				<span v-if="user.intl && !hideIntl" class="seventv-chat-user-username-login">
+					({{ user.username }})</span
+				>
 			</span>
 		</span>
 	</div>
@@ -87,6 +89,7 @@ const props = withDefaults(
 		isMention?: boolean;
 		hideAt?: boolean;
 		hideBadges?: boolean;
+		hideIntl?: boolean;
 		clickable?: boolean;
 		badges?: Record<string, string>;
 	}>(),
@@ -208,6 +211,16 @@ const stop = watch(
 
 	.seventv-chat-user-username {
 		font-weight: 700;
+
+		.seventv-chat-user-username-login {
+			font-weight: initial;
+		}
+
+		> span:not([data-seventv-painted-text]) {
+			.seventv-chat-user-username-login {
+				opacity: 0.6;
+			}
+		}
 	}
 }