diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index c9fbbc65..b89e2269 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -109,24 +109,32 @@ namespace ReallifeGamemode.Server.Events
 
               case 0:
                 player.SetSharedData("blipColor", 0);
+                player.SetSharedData("nameTagColor", 0);
                 break;
 
               case 8:
                 player.SetSharedData("blipColor", 83);
+                player.SetSharedData("nameTagColor", 8);
                 break;
 
               case 7:
                 player.SetSharedData("blipColor", 52);
+                player.SetSharedData("nameTagColor", 7);
                 break;
 
               case 4:
                 player.SetSharedData("blipColor", 5);
+                player.SetSharedData("nameTagColor", 4);
                 break;
               case 9:
                 player.SetSharedData("blipColor", 25);
+                player.SetSharedData("nameTagColor", 9);
+                break;
+              default:
+                player.SetSharedData("blipColor", 0);
+                player.SetSharedData("nameTagColor", 0);
                 break;
             }
-            if(user.FactionId != null) player.SetSharedData("nameTagColor", user.FactionId);
 
 
             if (user.CharacterId == null)