diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts
index 54bb8e21..18b5c524 100644
--- a/ReallifeGamemode.Client/Gui/blips.ts
+++ b/ReallifeGamemode.Client/Gui/blips.ts
@@ -27,7 +27,7 @@ export default function playerBlips() {
 
     mp.events.add("entityStreamOut", (entity) => {
         if (entity.type === "player") {
-            entity.blip = null;
+            //entity.blip = null;
         }
     });
 
diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts
index 61e522d8..df59090c 100644
--- a/ReallifeGamemode.Client/core/rage-mp/entities.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts
@@ -73,7 +73,6 @@ class RagePlayer extends RageEntity implements IPlayer {
 
     get nametagColor(): number {
         var color = this.player.getVariable("nameTagColor");
-        game.ui.sendChatMessage(`player = ${this.player.name} - color = ${color}`);
         if (!color)
             return 0;
         return color;
diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index c11dcb65..ac533405 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -1493,30 +1493,30 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 0:
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 8:
-            player.SetSharedData("nameTagColor", 8);
+            target.SetSharedData("nameTagColor", 8);
             break;
 
           case 7:
-            player.SetSharedData("nameTagColor", 7);
+            target.SetSharedData("nameTagColor", 7);
             break;
 
           case 4:
-            player.SetSharedData("nameTagColor", 4);
+            target.SetSharedData("nameTagColor", 4);
             break;
           case 9:
-            player.SetSharedData("nameTagColor", 9);
+            target.SetSharedData("nameTagColor", 9);
             break;
         }
         target.TriggerEvent("jailTime", 0);
-        if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
+        if (targetUser.FactionId != null) target.SetSharedData("nameTagColor", targetUser.FactionId);
         targetUser.Wanteds = 0;
         dbContext.SaveChanges();
       }
@@ -2452,7 +2452,7 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 0:
@@ -2475,7 +2475,7 @@ namespace ReallifeGamemode.Server.Commands
             
             break;
         }
-        if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
+        if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
         dbContext.SaveChanges();
       }
     }
@@ -2522,7 +2522,7 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 8:
@@ -2540,7 +2540,7 @@ namespace ReallifeGamemode.Server.Commands
             target.SetSharedData("blipColor", 25);
             break;
         }
-        if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
+        if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
         dbContext.SaveChanges();
       }
     }