diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index f2cffcd6..9a74f9e7 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -129,6 +129,7 @@ function loadESXPlayer(identifier, playerId, isNew)
         inventory = {},
         loadout = {},
         weight = 0,
+        name = GetPlayerName(playerId),
         identifier = identifier,
         firstName = "John",
         lastName = "Doe",
@@ -257,9 +258,12 @@ function loadESXPlayer(identifier, playerId, isNew)
         userData.firstName = result.firstname
         userData.lastName = result.lastname
 
+        local name = ("%s %s"):format(result.firstname, result.lastname)
+        userData.name = name
+        
         xPlayer.set("firstName", result.firstname)
         xPlayer.set("lastName", result.lastname)
-        xPlayer.setName(("%s %s"):format(result.firstname, result.lastname))
+        xPlayer.setName(name)
 
         if result.dateofbirth then
             userData.dateofbirth = result.dateofbirth