diff --git a/client/main.lua b/client/main.lua
index 1b2803bb..16d1f9c3 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -56,7 +56,7 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 	ESX.Game.Teleport(playerPed, {
 		x = playerData.coords.x,
 		y = playerData.coords.y,
-		z = playerData.coords.z + 0.25,
+		z = playerData.coords.z + 0.5,
 		heading = playerData.coords.heading
 	}, function()
 		isLoadoutLoaded, isDead = true, false
diff --git a/server/functions.lua b/server/functions.lua
index eaa7bd2a..74e2efcc 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -168,7 +168,7 @@ ESX.SavePlayer = function(xPlayer, cb)
 			['@group'] = xPlayer.getGroup(),
 			['@loadout'] = json.encode(xPlayer.getLoadout(true)),
 			['@position'] = json.encode(xPlayer.getCoords()),
-			['@identifier'] = xPlayer.identifier,
+			['@identifier'] = xPlayer.getIdentifier(),
 			['@inventory'] = json.encode(xPlayer.getInventory(true))
 		}, function(rowsChanged)
 			cb()
diff --git a/server/main.lua b/server/main.lua
index 7150adad..30e97f82 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -131,6 +131,10 @@ function loadESXPlayer(identifier, playerId)
 				})
 			end
 
+			table.sort(userData.inventory, function(a, b)
+				return a.label < b.label
+			end)
+
 			-- Group
 			if result[1].group then
 				userData.group = result[1].group
@@ -138,10 +142,6 @@ function loadESXPlayer(identifier, playerId)
 				userData.group = 'user'
 			end
 
-			table.sort(userData.inventory, function(a, b)
-				return a.label < b.label
-			end)
-
 			-- Loadout
 			if result[1].loadout and result[1].loadout ~= '' then
 				local loadout = json.decode(result[1].loadout)
@@ -184,12 +184,12 @@ function loadESXPlayer(identifier, playerId)
 		xPlayer.triggerEvent('esx:playerLoaded', {
 			accounts = xPlayer.getAccounts(),
 			coords = xPlayer.getCoords(),
-			identifier = xPlayer.identifier,
+			identifier = xPlayer.getIdentifier(),
 			inventory = xPlayer.getInventory(),
 			job = xPlayer.getJob(),
 			loadout = xPlayer.getLoadout(),
 			maxWeight = xPlayer.maxWeight,
-			money = xPlayer.getMoney(),
+			money = xPlayer.getMoney()
 		})
 
 		xPlayer.triggerEvent('esx:createMissingPickups', ESX.Pickups)