diff --git a/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj b/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
index ff3d12d2..215a975b 100644
--- a/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
+++ b/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
@@ -14,10 +14,13 @@
 
   <ItemGroup>
     <Compile Remove="Gui\vehiclemenu\web\**" />
+    <Compile Remove="Jobs\BusDriver\**" />
     <Compile Remove="tmp\**" />
     <EmbeddedResource Remove="Gui\vehiclemenu\web\**" />
+    <EmbeddedResource Remove="Jobs\BusDriver\**" />
     <EmbeddedResource Remove="tmp\**" />
     <None Remove="Gui\vehiclemenu\web\**" />
+    <None Remove="Jobs\BusDriver\**" />
     <None Remove="tmp\**" />
   </ItemGroup>
 
diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index 990fd80e..ae425b5c 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -7,6 +7,7 @@ using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Job;
 using ReallifeGamemode.Server.Managers;
 using ReallifeGamemode.Server.Models;
+using ReallifeGamemode.Server.Util;
 
 /**
 * @overview Life of German Reallife - Event Login (Login.cs)
@@ -35,6 +36,11 @@ namespace ReallifeGamemode.Server.Events
       {
         NAPI.Util.ConsoleOutput(player.Name + " Timeoutet");
       }
+      
+      if (UserHelper.dutyAdmins.Contains(player))
+      {
+        UserHelper.dutyAdmins.Remove(player);
+      }
 
       JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
       if (job != null) job.StopJob(player, true);
@@ -53,4 +59,4 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isLoggedIn", false);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ReallifeGamemode.Server/Util/UserHelper.cs b/ReallifeGamemode.Server/Util/UserHelper.cs
index e0d6de98..90424273 100644
--- a/ReallifeGamemode.Server/Util/UserHelper.cs
+++ b/ReallifeGamemode.Server/Util/UserHelper.cs
@@ -6,7 +6,7 @@ using GTANetworkAPI;
 
 namespace ReallifeGamemode.Server.Util
 {
-  static class UserHelper
+  public static class UserHelper
   {
     public static List<Client> dutyAdmins = new List<Client>();
   }