diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index a393cfd4..b1564065 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -290,7 +290,7 @@ namespace ReallifeGamemode.Server.Commands
         }
         ChatService.SendMessage(target, "!{#8181E9}Deine Akte wurde von " + player.Name + " gelöscht. Grund: " + reason);
         ChatService.BroadcastFaction("!{#8181E9}HQ: Die Akte von " + target.Name + " wurde von " + player.Name + " gelöscht. Grund: " + reason + ".", new List<int>() { 1, 3 });
-        switch ((int?)targetUser.Faction.Id)
+        switch (targetUser.FactionId)
         {
           case null:
             target.SetSharedData("blipColor", 0);
diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index 64e18896..4aeb4f21 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -58,23 +58,7 @@ namespace ReallifeGamemode.Server.Events
               player.SetData("editmode", false);
               player.SetData("quicksavemode", "none");
             }
-            switch ((int?)user.Faction.Id)
-            {
-              case null:
-                player.SetSharedData("blipColor", 0);
-                break;
-              case 8:
-                player.SetSharedData("blipColor", 83);
-                break;
-              case 7:
-                player.SetSharedData("blipColor", 52);
-                break;
-              case 4:
-                player.SetSharedData("blipColor", 5);
-                break;
-            }
-            
-                    
+   
             var userBankAccount = user.GetBankAccount();
             userBankAccount.Balance = userBankAccount.Balance;
 
@@ -97,6 +81,22 @@ namespace ReallifeGamemode.Server.Events
             var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
             player.SetData("items", userItems);
 
+            switch (user.FactionId)
+            {
+              case null:
+                player.SetSharedData("blipColor", 0);
+                break;
+              case 8:
+                player.SetSharedData("blipColor", 83);
+                break;
+              case 7:
+                player.SetSharedData("blipColor", 52);
+                break;
+              case 4:
+                player.SetSharedData("blipColor", 5);
+                break;
+            }
+
             if (user.CharacterId == null)
             {
               var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension");
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index 3d40f2b0..bf74479a 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Managers
           ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
           ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
 
-          switch ((int?)own.Faction.Id)
+          switch (own.FactionId)
           {
             case null:
               player.SetSharedData("blipColor", 0);
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index ad369718..2c61e15c 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -22,8 +22,11 @@ namespace ReallifeGamemode.Server.Wanted
       User user = client.GetUser();
       if (user.JailTime > 0)
       {
-        switch (user.Faction.Id)
+        switch (user.FactionId)
         {
+          case null:
+            client.SetSharedData("blipColor", 0);
+            break;
           case 8:
             client.SetSharedData("blipColor", 83);
             break;
@@ -33,9 +36,7 @@ namespace ReallifeGamemode.Server.Wanted
           case 4:
             client.SetSharedData("blipColor", 5);
             break;
-          default:
-            client.SetSharedData("blipColor", 0);
-            break;
+
         }
         client.RemoveAllWeapons();
         client.Health = 100;