diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index e9787049..f1f7fcbd 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -249,7 +249,7 @@ namespace ReallifeGamemode.Server.Managers
 
             var job = taxiJob.TaxiContracts.Where(t => t.Name == name).First();
 
-            var target = NAPI.Player.GetPlayerFromName(name);
+            var target = ClientService.GetClientByNameOrId(name);
             if (target == null)
             {
                 taxiJob.TaxiContracts.Remove(job);
@@ -259,6 +259,8 @@ namespace ReallifeGamemode.Server.Managers
 
             job.Driver = player;
 
+            player.TriggerEvent("SERVER:Util_setWaypoint", target.Position.X, target.Position.Y);
+
             ChatService.SendMessage(target, $"!{{02FCFF}}Dein Auftrag wurde von {player.Name} angenommen. Warte an deiner aktuellen Position.");
             ChatService.SendMessage(player, $"!{{02FCFF}}Du hast den Auftrag von {name} angenommen. Hole ihn nun ab.");
         }