diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
index a355ed8cc..80706fe29 100644
--- a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
+++ b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
@@ -74,20 +74,10 @@ function OpenChiefAddVehicleMenu()
                                 {type = "number", label = "Rang", description = "Ab welchen Rang darf man das Fahrzeug Fahren?"}
                             })
 
-                            QBCore.Functions.TriggerCallback('mh_jobgarage:AddVehicleToJob', function(cb)
-                                if cb.status then
-                                    Notification("Schlüsselkasten", cb.text, cb.type)
-                                    lib.hideContext('ChiefAddVehicleMenu')
-                                    QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb)
-                                        OpenMenu(cb)
-                                    end, Player.job.name)
-                                else
-                                    Notification("Schlüsselkasten", cb.text, cb.type)
-                                    if cb.key then
-                                        SetNewWaypoint(Config.KeyMaker.x, Config.KeyMaker.y)
-                                    end
-                                end
-                            end, vehicles[i].plate, value)
+                            TriggerServerEvent('mh_jobgarage:AddVehicleToJob', vehicles[i].plate, value)
+                            QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb)
+                                OpenMenu(cb)
+                            end, Player.job.name)
                         end
                     })
 
diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua
index 62e705e20..79b5436aa 100644
--- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua
+++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua
@@ -16,47 +16,25 @@ end)
 
 -- mh_jobgarage:AddVehicleToJob VARIABLEN: 
 
-QBCore.Functions.CreateCallback('mh_jobgarage:AddVehicleToJob', function(source, cb, plate, stats)
+RegisterServerEvent('mh_jobgarage:AddVehicleToJob')
+AddEventHandler('mh_jobgarage:AddVehicleToJob', function(plate, stats)
     local Player = QBCore.Functions.GetPlayer(source)
     local pedid = Player.PlayerData.citizenid
     local pedjob = Player.PlayerData.job.name
-    
-    local isOwner = CheckVehicleOwner(pedid, plate)--MySQL.query("SELECT * FROM player_vehicles WHERE citizenid = ? and plate = ?", {pedid, plate})
-    local haveKeys = MySQL.query("SELECT * FROM vehicle_keys WHERE owner = ? and plate = ?", {pedid, plate})
 
-    if isOwner and haveKeys then
-        if haveKeys[1].count == stats[2] then
-            MySQL.query("DELETE FROM vehicle_keys SET owner = ? AND plate = ?", {pedid, plate})
-        elseif haveKeys[1].count > stats[2] then
-            MySQL.query("UPDATE vehicle_keys SET count = count - ? WHERE owner = ? and plate  = ?", {stats[2], pedid, plate})
-        end
-
-        MySQL.query("INSERT INTO mh_jobgarage(job, rang, value, plate, name, closed) VALUES (?, ?, ?, ?, ?, ?)", {pedjob, stats[3], stats[2], plate, stats[1], "false"}, function(rs)
-            if rs then
-                MySQL.query("UPDATE player_vehicles SET citizenid = ? WHERE owner = ? and plate  = ?", {"11111111111", pedid, plate})
-                cb({
-                    status = true,
-                    text = "Fahrzeug wurde Hinzugefügt!",
-                    type ="success"
-                })
+    MySQL.query("SELECT * FROm vehicle_keys WHERE owner = ? AND plate = ?", {pedid, plate}, function(rs)
+        if rs ~= nil and rs[1] ~= nil then
+            if rs[1].count == stats[2] then
+                MySQL.query("DELETE FROM vehicle_keys WHERE owner = ? AND plate = ?", {pedid, plate})
+            else
+                MySQL.query("UPDATE vehicle_keys SET count = count - ? WHERE owner = ? AND plate = ?", {stats[2], pedid, plate})
             end
-        end)
-    else
-        if not isOwner then
-            cb({
-                status = false,
-                text = "Du bist nicht der Besitzer vom Fahrzeug!",
-                type ="warning"
-            })
-        elseif not haveKeys then
-            cb({
-                status = false,
-                key = true,
-                text = "Du hast keinen Ersatzschlüssel, Stelle erst welche her. \nMakierung wurde dir gesetzt!",
-                type = "inform"
-            })
         end
-    end
+    end)
+
+    MySQL.query("INSERT INTO mh_jobgarage(job, rang, value, plate, name, closed) VALUES (?, ?, ?, ?, ?, ?)", {pedjob, stats[3], stats[2], plate, stats[1], "false"})
+    MySQL.query("UPDATE player_vehicles SET citizenid = ? WHERE citizenid = ? and plate  = ?", {pedjob, pedid, plate})
+    TriggerClientEvent('mh_jobgarage:notify', source, "Schlüsselkasten", "Schlüssel Hinzugefügt!", "success")
 end)