diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 87ff1b93..a393cfd4 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -290,9 +290,11 @@ 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.Id)
+        switch ((int?)targetUser.Faction.Id)
         {
+          case null:
+            target.SetSharedData("blipColor", 0);
+            break;
           case 8:
             target.SetSharedData("blipColor", 83);
             break;
@@ -302,11 +304,8 @@ namespace ReallifeGamemode.Server.Commands
           case 4:
             target.SetSharedData("blipColor", 5);
             break;
-          default:
-            target.SetSharedData("blipColor", 0);
-            break;
         }
-        
+
 
         targetUser.Wanteds = 0;
         dbContext.SaveChanges();
diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index ca077135..64e18896 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -58,20 +58,20 @@ namespace ReallifeGamemode.Server.Events
               player.SetData("editmode", false);
               player.SetData("quicksavemode", "none");
             }
-              switch (user.Faction.Id)
-              {
-                case 8:
-                  player.SetSharedData("blipColor", 83);
-                  break;
-                case 7:
-                  player.SetSharedData("blipColor", 52);
-                  break;
-                case 4:
-                  player.SetSharedData("blipColor", 5);
-                  break;
-              default:
+            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;
             }
             
                     
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index fff23e38..3d40f2b0 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -64,19 +64,22 @@ namespace ReallifeGamemode.Server.Managers
           ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
           ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
 
-            switch (own.Faction.Name)
-            {
-              case "Ballas":
-                player.SetSharedData("blipColor", 83);
-                break;
-              case "Grove":
-                player.SetSharedData("blipColor", 52);
-                break;
-              case "Trucker":
-                player.SetSharedData("blipColor", 5);
-                break;
+          switch ((int?)own.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;
           }
-          
+
           dbContext.SaveChanges();
         }
       }