diff --git a/client/main.lua b/client/main.lua
index 2c1fb9bf..3424420f 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -74,7 +74,7 @@ function StartRespawnToHospitalMenuTimer()
 
 						ESX.TriggerServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function()
 
-							ESX.PlayerData.lastPosition = Config.Zones.HospitalInteriorInside1.Pos
+							ESX.SetPlayerData('lastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 							TriggerServerEvent('esx:updateLastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 
 							RespawnPed(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos)
@@ -113,6 +113,7 @@ function StartRespawnTimer()
 
 				ESX.TriggerServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function()
 
+					ESX.SetPlayerData('lastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 					TriggerServerEvent('esx:updateLastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 
 					RespawnPed(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos)
@@ -172,6 +173,7 @@ function RespawnTimer()
 						ESX.TriggerServerCallback('esx_ambulancejob:removeItemsAfterRPDeathRemoveMoney', function()
 
 							TriggerServerEvent('esx_ambulancejob:removeAccountMoney', source)
+							ESX.SetPlayerData('lastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 							TriggerServerEvent('esx:updateLastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 
 							RespawnPed(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos)
@@ -220,6 +222,7 @@ function RespawnTimer()
 
 					ESX.TriggerServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function()
 
+						ESX.SetPlayerData('lastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 						TriggerServerEvent('esx:updateLastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 
 						RespawnPed(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos)
@@ -662,6 +665,7 @@ AddEventHandler('esx_ambulancejob:revive', function()
 			Citizen.Wait(0)
 		end
 
+		ESX.SetPlayerData('lastPosition', Config.Zones.HospitalInteriorInside1.Pos)
 		TriggerServerEvent('esx:updateLastPosition', {
 			x = coords.x,
 			y = coords.y,
diff --git a/config.lua b/config.lua
index 6331f291..02206d7b 100644
--- a/config.lua
+++ b/config.lua
@@ -7,11 +7,11 @@ Config.RemoveWeaponsAfterRPDeath = true
 Config.RemoveCashAfterRPDeath    = true
 Config.RemoveItemsAfterRPDeath   = true
 Config.EnablePlayerManagement    = false
-Config.ShowDeathTimer			 = false
-Config.EarlyRespawn				 = false
-Config.EarlyRespawnFine			 = false
-Config.EarlyRespawnFineAmount	 = 500
-Config.Locale                   = 'fr'
+Config.ShowDeathTimer			       = true
+Config.EarlyRespawn				       = true
+Config.EarlyRespawnFine			     = true
+Config.EarlyRespawnFineAmount	   = 500
+Config.Locale                    = 'fr'
 
 Config.Zones = {