diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs
index a8595278..ce4f8b05 100644
--- a/ReallifeGamemode.Server/Job/BusDriverJob.cs
+++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs
@@ -433,7 +433,7 @@ namespace ReallifeGamemode.Server.Job
       player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
       player.StartCheckPointRoute(selectedRoute, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
       if (index != -1)
-        player.SendChatMessage($"~y~[JOB]: ~w~Dir wurde ~g~ Route {index}~w~ zugeteilt.");
+        player.SendChatMessage($"~y~[JOB]: ~w~Dir wurde ~g~ Route {index + 1}~w~ zugeteilt.");
     }
 
     public override void LastCheckpoint(Player player)
diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index 2acfd127..d6273e28 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -162,7 +162,7 @@ namespace ReallifeGamemode.Server.Managers
 
       JobBase job = GetJob(u.JobId ?? -1);
 
-      if (job == null)
+      if (job == null || !job.GetUsersInJob().Contains(player))
         return;
 
       job.StartJobEndTimer(player);
@@ -303,7 +303,6 @@ namespace ReallifeGamemode.Server.Managers
     [ServerEvent(Event.PlayerExitVehicle)]
     public void JobManagerPlayerExitVehicle2(Player player, Vehicle veh)
     {
-
     }
 
     [RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")]