diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index e666723d..0aabb128 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -48,11 +48,7 @@ namespace ReallifeGamemode.Server.Events
       {
         GlobalHelper.DutyAdmins.Remove(player);
       }*/
-
-      if (player.GetUser().IsAdmin(AdminLevel.MAPPING))
-      {
-        ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING);
-      }
+      
       /*
       TaxiDriverJob taxiJob = JobManager.GetJob<TaxiDriverJob>();
       TaxiContract taxiContract = taxiJob.TaxiContracts.Where(t => t.Name == player.Name).FirstOrDefault();
@@ -132,11 +128,16 @@ namespace ReallifeGamemode.Server.Events
         user.PositionZ = pos.Z;
         saveUser.SaveChanges();
         user.Dead = player.HasData("isDead") ? (bool)player.GetData<bool>("isDead") : false;
-      }
 
-      if (player.GetUser().Wanteds > 0)
-      {
-        ChatService.HQMessage("!{#FFFF00}** Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden");
+        if (user.IsAdmin(AdminLevel.MAPPING))
+        {
+          ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING);
+        }
+
+        if (user.Wanteds > 0)
+        {
+          ChatService.HQMessage("!{#FFFF00}** Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden");
+        }
       }
 
       player.SetData("isLoggedIn", false);