diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index e1e92fb2..87ff1b93 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -291,18 +291,21 @@ 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 });
         target.SetSharedData("blipColor", 0);
-        switch (targetUser.Faction.Name)
-          {
-            case "Ballas":
-              target.SetSharedData("blipColor", 83);
-              break;
-            case "Grove":
-              target.SetSharedData("blipColor", 52);
-              break;
-            case "Trucker":
-              target.SetSharedData("blipColor", 5);
-              break;
-          }
+        switch (targetUser.Faction.Id)
+        {
+          case 8:
+            target.SetSharedData("blipColor", 83);
+            break;
+          case 7:
+            target.SetSharedData("blipColor", 52);
+            break;
+          case 4:
+            target.SetSharedData("blipColor", 5);
+            break;
+          default:
+            target.SetSharedData("blipColor", 0);
+            break;
+        }
         
 
         targetUser.Wanteds = 0;
diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index 98b6ee3c..ca077135 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -58,18 +58,21 @@ namespace ReallifeGamemode.Server.Events
               player.SetData("editmode", false);
               player.SetData("quicksavemode", "none");
             }
-              switch (user.Faction.Name)
+              switch (user.Faction.Id)
               {
-                case "Ballas":
+                case 8:
                   player.SetSharedData("blipColor", 83);
                   break;
-                case "Grove":
+                case 7:
                   player.SetSharedData("blipColor", 52);
                   break;
-                case "Trucker":
+                case 4:
                   player.SetSharedData("blipColor", 5);
                   break;
-              }
+              default:
+                player.SetSharedData("blipColor", 0);
+                break;
+            }
             
                     
             var userBankAccount = user.GetBankAccount();
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index ca887314..fff23e38 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -75,7 +75,7 @@ namespace ReallifeGamemode.Server.Managers
               case "Trucker":
                 player.SetSharedData("blipColor", 5);
                 break;
-            }
+          }
           
           dbContext.SaveChanges();
         }
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 27cd38db..ad369718 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -22,7 +22,21 @@ namespace ReallifeGamemode.Server.Wanted
       User user = client.GetUser();
       if (user.JailTime > 0)
       {
-        client.SetSharedData("blipColor", 0);
+        switch (user.Faction.Id)
+        {
+          case 8:
+            client.SetSharedData("blipColor", 83);
+            break;
+          case 7:
+            client.SetSharedData("blipColor", 52);
+            break;
+          case 4:
+            client.SetSharedData("blipColor", 5);
+            break;
+          default:
+            client.SetSharedData("blipColor", 0);
+            break;
+        }
         client.RemoveAllWeapons();
         client.Health = 100;
         client.Armor = 0;