diff --git a/Modules/BetterHostManager.cs b/Modules/BetterHostManager.cs
index 5e66038..550f3af 100644
--- a/Modules/BetterHostManager.cs
+++ b/Modules/BetterHostManager.cs
@@ -228,7 +228,7 @@ class BetterHostManager
                 else if (player.BetterData().IsBetterUser)
                     sbTopTag.Append("<color=#0dff00>Better User</color>+++");
             }
-            else if (GameStates.IsInGamePlay)
+            else if (GameStates.IsInGamePlay && !GameStates.IsHideNSeek)
             {
                 string Role = $"<color={player.GetTeamHexColor()}>{player.GetRoleName()}</color>";
                 if (!player.IsImpostorTeam() && player.myTasks.Count > 0)
@@ -267,9 +267,9 @@ class BetterHostManager
                 NewName = $"{NewName}";
 
             // Don't send rpc if name is the same!
-            if (player.BetterData().LastNameSetFor.TryGetValue(target.PlayerId, out var lastName) && lastName == NewName)
+            if (player.BetterData().LastNameSetFor.TryGetValue(target.PlayerId, out var lastName))
             {
-                if (!force)
+                if (lastName == NewName || !force)
                 {
                     return;
                 }
diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs
index 4473e55..421e6b5 100644
--- a/Patches/PlayerControlPatch.cs
+++ b/Patches/PlayerControlPatch.cs
@@ -163,7 +163,7 @@ class PlayerControlPatch
 
                 sbTagBottom.Append($"<color={friendCodeColor}>{friendCode}</color>+++");
             }
-            else if (GameStates.IsInGame || GameStates.IsFreePlay)
+            else if (GameStates.IsInGame || GameStates.IsFreePlay && !GameStates.IsHideNSeek)
             {
                 if (player.IsImpostorTeammate() || player == PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.IsAlive() || DebugMenu.RevealRoles)
                 {