diff --git a/[esx]/esx_identity/client/main.lua b/[esx]/esx_identity/client/main.lua
index 7920fc75..62c25007 100644
--- a/[esx]/esx_identity/client/main.lua
+++ b/[esx]/esx_identity/client/main.lua
@@ -1,12 +1,10 @@
 local loadingScreenFinished = false
 local ready = false
+local guiEnabled = false
+local timecycleModifier = "hud_def_blur"
 
-RegisterNetEvent('esx_identity:alreadyRegistered')
-AddEventHandler('esx_identity:alreadyRegistered', function()
-    while not loadingScreenFinished do
-        Wait(100)
-    end
-
+RegisterNetEvent('esx_identity:alreadyRegistered', function()
+    while not loadingScreenFinished do Wait(100) end
     TriggerEvent('esx_skin:playerRegistered')
 end)
 
@@ -20,32 +18,23 @@ RegisterNUICallback('ready', function(data, cb)
 end)
 
 if not Config.UseDeferrals then
-    local guiEnabled = false
-
     function EnableGui(state)
         SetNuiFocus(state, state)
         guiEnabled = state
-        while not ready do
-            Wait(500)
-        end
+
         if state then
-            SetTimecycleModifier("hud_def_blur")
+            SetTimecycleModifier(timecycleModifier)
         else
             ClearTimecycleModifier()
         end
-        SendNUIMessage({
-            type = "enableui",
-            enable = state
-        })
+
+        SendNUIMessage({type = "enableui",enable = state})
     end
 
-    RegisterNetEvent('esx_identity:showRegisterIdentity')
-    AddEventHandler('esx_identity:showRegisterIdentity', function()
+    RegisterNetEvent('esx_identity:showRegisterIdentity', function()
         TriggerEvent('esx_skin:resetFirstSpawn')
 
-        if not ESX.PlayerData.dead then
-            EnableGui(true)
-        end
+        if not ESX.PlayerData.dead then EnableGui(true) end
     end)
 
     RegisterNUICallback('register', function(data, cb)
@@ -53,11 +42,10 @@ if not Config.UseDeferrals then
             if callback then
                 ESX.ShowNotification(_U('thank_you_for_registering'))
                 EnableGui(false)
+
                 if not ESX.GetConfig().Multichar then
                     TriggerEvent('esx_skin:playerRegistered')
                 end
-            else
-                ESX.ShowNotification(_U('registration_error'), "error", 5000)
             end
         end, data)
     end)
@@ -87,7 +75,10 @@ if not Config.UseDeferrals then
                 DisableControlAction(0, 143, true) -- disable melee
                 DisableControlAction(0, 75, true) -- disable exit vehicle
                 DisableControlAction(27, 75, true) -- disable exit vehicle
+            else
+                sleep = 1500
             end
+
             Wait(sleep)
         end
     end)
diff --git a/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua
index ed06ac9b..3cabbda0 100644
--- a/[esx]/esx_identity/config.lua
+++ b/[esx]/esx_identity/config.lua
@@ -5,8 +5,12 @@ Config.Locale           = 'en'
 -- Enables Commands Such As /char and /chardel
 Config.EnableCommands   = ESX.GetConfig().EnableDebug
 
-Config.UseDeferrals     = false -- EXPERIMENTAL Character Registration Method.
+-- EXPERIMENTAL Character Registration Method
+Config.UseDeferrals     = false
 
+-- These values are for the date format in the registration menu
+-- Choices: DD/MM/YYYY | MM/DD/YYYY | YYYY/MM/DD
+Config.DateFormat       = 'DD/MM/YYYY'
 
 -- These values are for the second input validation in server/main.lua
 Config.MaxNameLength    = 20 -- Max Name Length.
diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua
index 82cd5fda..d321a8c5 100644
--- a/[esx]/esx_identity/fxmanifest.lua
+++ b/[esx]/esx_identity/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Identity'
 
-version '1.7.5'
+version '1.7.6'
 
 shared_script '@es_extended/imports.lua'
 
diff --git a/[esx]/esx_identity/html/css/style.css b/[esx]/esx_identity/html/css/style.css
index 0a54d1ee..5915443e 100644
--- a/[esx]/esx_identity/html/css/style.css
+++ b/[esx]/esx_identity/html/css/style.css
@@ -25,7 +25,7 @@ body {
 	color: #ffffff;
 }
 
-.aa {
+.title {
 	font-family: 'Oswald', sans-serif;
 	font-size: 22px;
 	text-align: center;
diff --git a/[esx]/esx_identity/html/index.html b/[esx]/esx_identity/html/index.html
index d3cd00de..bbe7eb58 100644
--- a/[esx]/esx_identity/html/index.html
+++ b/[esx]/esx_identity/html/index.html
@@ -8,15 +8,15 @@
 
 	<body onkeydown="TriggeredKey(this)">
 		<div class="dialog">
-			<div class="aa"><b>IDENTITY</b></div>
+			<div class="title"><b>IDENTITY</b></div>
            <!--	<img id="logo" height="110px" width="332px"> > -->	
 			<form id="register" name="register" action="#">
 				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif";>First Name</div>
-				<input id="firstname" type="text"  class=""  name="firstname" placeholder="First Name" onKeyDown="if(this.value.length==16 && event.keyCode!=8)"><br>
+				<input id="firstname" type="text" class="" name="firstname" placeholder="First Name" onKeyDown="if(this.value.length==16 && event.keyCode!=8)"><br>
 				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif";>Last Name</div>
 				<input id="lastname" type="text" class="" name="lastname" placeholder="Last Name" onKeyDown="if(this.value.length==16 && event.keyCode!=8)"><br>
 				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif", sans-serif;>Date of Birth (MM/DD/YYYY)</div>
-				<input id="dateofbirth" type="date" name="dateofbirth" class="" placeholder="Date of Birth (dd/mm/yyy)" min="01/01/1900" max="01/01/2010" onfocus="(this.type='date')"><br>
+				<input id="dateofbirth" type="date" name="dateofbirth" class="" placeholder="Date of Birth (dd/mm/yyyy)" min="01/01/1900" max="01/01/2010" onfocus="(this.type='date')"><br>
 				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif", sans-serif;>Height</div>
 				<input id="height" type="number" class="" name="height" min="120" max="220" placeholder="Height (cm)" onKeyDown="if(this.value.length==3 && event.keyCode!=8)"><br>
 				<center>
@@ -28,16 +28,11 @@
 						<label for="radiof">Female</label>
 					</div>
 				</center>
-					<!-- <div class="range-wrap" style="width: 80%;">
-						<input type="range" id="height" class="range" min="48" max="96" value="48">
-						<output class="bubble"></output>
-					</div> -->
 				<button id="submit" type="submit"><font size="4px">CREATE</font></button>
 			</form>
 			<center><font size="1px" color="green">If the submit button doesn't work, please ensure that you've entered the fields correctly.</font></center>
 		</div>
 		<script>
-
 			const allRanges = document.querySelectorAll(".range-wrap");
 			allRanges.forEach(wrap => {
 				const range = wrap.querySelector(".range");
diff --git a/[esx]/esx_identity/html/js/script.js b/[esx]/esx_identity/html/js/script.js
index 810345ac..85102cb4 100644
--- a/[esx]/esx_identity/html/js/script.js
+++ b/[esx]/esx_identity/html/js/script.js
@@ -1,36 +1,35 @@
 $(function() {
-	$.post('http://esx_identity/ready', JSON.stringify({}));
+	$.post('http://esx_identity/ready', JSON.stringify({}))
 
 	window.addEventListener('message', function(event) {
-		if (event.data.type == "enableui") {
-			document.body.style.display = event.data.enable ? "block" : "none";
+		if (event.data.type === "enableui") {
+			document.body.style.display = event.data.enable ? "block" : "none"
 		}
-	});
-	
-	$("#register").submit(function(event) {
-		event.preventDefault(); // Prevent form from submitting
-		
-		// Verify date
-		var date = $("#dateofbirth").val();
-		var dateCheck = new Date($("#dateofbirth").val());
+	})
 
+	$("#register").submit(function(event) {
+		event.preventDefault() // Prevent form from submitting
+			
+		// Verify date
+		var date = $("#dateofbirth").val()
+		var dateCheck = new Date($("#dateofbirth").val())
+	
 		if (dateCheck == "Invalid Date") {
-			date == "invalid";
-		}
-		else {
+			date == "invalid"
+		} else {
 			const ye = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(dateCheck)
 			const mo = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(dateCheck)
 			const da = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(dateCheck)
 			
-			var formattedDate = `${da}/${mo}/${ye}`;
-
+			var formattedDate = `${da}/${mo}/${ye}`
+	
 			$.post('http://esx_identity/register', JSON.stringify({
 				firstname: $("#firstname").val(),
 				lastname: $("#lastname").val(),
 				dateofbirth: formattedDate,
 				sex: $("input[type='radio'][name='sex']:checked").val(),
 				height: $("#height").val()
-			}));
+			}))
 		}
-	});
-});
+	})
+})
diff --git a/[esx]/esx_identity/locales/en.lua b/[esx]/esx_identity/locales/en.lua
index fd5f0ba9..a2bab9ce 100644
--- a/[esx]/esx_identity/locales/en.lua
+++ b/[esx]/esx_identity/locales/en.lua
@@ -1,33 +1,38 @@
 Locales['en'] = {
   ['show_active_character'] = 'Show Active Character',
   ['active_character'] = 'Active Character: %s',
-  ['error_active_character'] = "There was an error obtaining your data.",
-  ['delete_character'] = 'Delete Current Character And Create a new one.',
-  ['deleted_character'] = 'Character Deleted.',
-  ['error_delete_character'] = "There was a problem deleting your character.",
-  ['thank_you_for_registering'] = "Successfully Registered, Enjoy!",
-  ['registration_error'] = "Your Data is incorrect.",
-  ['debug_xPlayer_get_first_name'] = "Returns Your forename",
-  ['debug_xPlayer_get_last_name'] = "Returns Your surname",
-  ['debug_xPlayer_get_full_name'] = "Return Your Name",
-  ['debug_xPlayer_get_sex'] = "Returns Your Sex",
-  ['debug_xPlayer_get_dob'] = "Returns Your DOB",
-  ['debug_xPlayer_get_height'] = "Returns Your Height",
-  ['error_debug_xPlayer_get_first_name'] = "There was an issue while obtaining your forename.",
-  ['error_debug_xPlayer_get_last_name'] = "There was an issue while obtaining your surname.",
-  ['error_debug_xPlayer_get_full_name'] = "There was an issue while obtaining your name.",
-  ['error_debug_xPlayer_get_sex'] = "There was an issue while obtaining your sex.",
-  ['error_debug_xPlayer_get_dob'] = "There was an issue while obtaining your date of birth.",
-  ['error_debug_xPlayer_get_height'] = "There was an issue while obtaining your height.",
-  ['return_debug_xPlayer_get_first_name'] = "First Name: %s",
-  ['return_debug_xPlayer_get_last_name'] = "Last Name: %s",
-  ['return_debug_xPlayer_get_full_name'] = "Name: %s",
-  ['return_debug_xPlayer_get_sex'] = "Sex: %s",
-  ['return_debug_xPlayer_get_dob'] = "DOB: %s",
-  ['return_debug_xPlayer_get_height'] = "Height: %s Inches",
+  ['error_active_character'] = 'There was an error obtaining your data.',
+  ['delete_character'] = 'Delete Your Current Character.',
+  ['deleted_character'] = 'Character Deleted',
+  ['error_delete_character'] = 'There was a problem deleting your character.',
+  ['thank_you_for_registering'] = 'Registration Successful. Enjoy!',
+  ['debug_xPlayer_get_first_name'] = 'Returns Your First Name',
+  ['debug_xPlayer_get_last_name'] = 'Returns Your Last Name',
+  ['debug_xPlayer_get_full_name'] = 'Returns Your Full Name',
+  ['debug_xPlayer_get_sex'] = 'Returns Your Sex',
+  ['debug_xPlayer_get_dob'] = 'Returns Your DOB',
+  ['debug_xPlayer_get_height'] = 'Returns Your Height',
+  ['error_debug_xPlayer_get_first_name'] = 'There was an issue while obtaining your first name.',
+  ['error_debug_xPlayer_get_last_name'] = 'There was an issue while obtaining your last name.',
+  ['error_debug_xPlayer_get_full_name'] = 'There was an issue while obtaining your full name.',
+  ['error_debug_xPlayer_get_sex'] = 'There was an issue while obtaining your sex.',
+  ['error_debug_xPlayer_get_dob'] = 'There was an issue while obtaining your date of birth.',
+  ['error_debug_xPlayer_get_height'] = 'There was an issue while obtaining your height.',
+  ['return_debug_xPlayer_get_first_name'] = 'First Name: %s',
+  ['return_debug_xPlayer_get_last_name'] = 'Last Name: %s',
+  ['return_debug_xPlayer_get_full_name'] = 'Name: %s',
+  ['return_debug_xPlayer_get_sex'] = 'Sex: %s',
+  ['return_debug_xPlayer_get_dob'] = 'DOB: %s',
+  ['return_debug_xPlayer_get_height'] = 'Height: %s Inches',
   ['data_incorrect'] = 'Invalid Data, Please try again.',
   ['invalid_format'] = 'Invalid Data Format, Please try again.',
-  ['no_identifier'] = '[ESX Identity]\nThere was an issue while loading your character!\nError code: identifier-missing\n\nThis is caused by your identifier being missing. Please come back later or report this problem to the Server Owner.',
-  ['missing_identity'] = '[ESX Identity]\nThere was an issue loading your character!\nError code: identity-missing\n\nIt seems like your identity is missing, try connecting again.',
-  ['deleted_identity'] = 'Character deleted, Please rejoin to create a new character.'
+  ['no_identifier'] = '[ESX Identity]\nThere was an issue while loading your character!\nError Code: identifier-missing\n\nThis is caused by your identifier being missing. Please come back later or report this problem to the Server Owner.',
+  ['missing_identity'] = '[ESX Identity]\nThere was an issue loading your character!\nError Code: identity-missing\n\nIt seems like your identity is missing, try connecting again.',
+  ['deleted_identity'] = 'Character deleted. Please rejoin to create a new character.',
+  ['already_registered'] = 'You have already registered.',
+  ['invalid_firstname_format'] = 'Invalid Format (First Name): Please try again.',
+  ['invalid_lastname_format'] = 'Invalid Format (Last Name): Please try again.',
+  ['invalid_dob_format'] = 'Invalid Format (DOB): Please try again.',
+  ['invalid_sex_format'] = 'Invalid Format (Sex): Please try again.',
+  ['invalid_height_format'] = 'Invalid Format (Height): Please try again.'
 }
diff --git a/[esx]/esx_identity/server/main.lua b/[esx]/esx_identity/server/main.lua
index 6b01cf31..eaf5d1b3 100644
--- a/[esx]/esx_identity/server/main.lua
+++ b/[esx]/esx_identity/server/main.lua
@@ -2,387 +2,7 @@ local playerIdentity = {}
 local alreadyRegistered = {}
 local multichar = ESX.GetConfig().Multichar
 
-if Config.UseDeferrals then
-    AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
-        deferrals.defer()
-        local playerId, identifier = source, ESX.GetIdentifier(source)
-        Wait(100)
-
-        if identifier then
-            MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
-                {identifier}, function(result)
-                    if result then
-                        if result.firstname then
-                            playerIdentity[identifier] = {
-                                firstName = result.firstname,
-                                lastName = result.lastname,
-                                dateOfBirth = result.dateofbirth,
-                                sex = result.sex,
-                                height = result.height
-                            }
-
-                            deferrals.done()
-                        else
-                            deferrals.presentCard(
-                                [==[{"type": "AdaptiveCard","body":[{"type":"Container","items":[{"type":"ColumnSet","columns":[{"type":"Column","items":[{"type":"Input.Text","placeholder":"First Name","id":"firstname","maxLength":15},{"type":"Input.Text","placeholder":"Date of Birth (MM/DD/YYYY)","id":"dateofbirth","maxLength":10}],"width":"stretch"},{"type":"Column","width":"stretch","items":[{"type":"Input.Text","placeholder":"Last Name","id":"lastname","maxLength":15},{"type":"Input.Text","placeholder":"Height (48-96 inches)","id":"height","maxLength":2}]}]},{"type":"Input.ChoiceSet","placeholder":"Sex","choices":[{"title":"Male","value":"m"},{"title":"Female","value":"f"}],"style":"expanded","id":"sex"}]},{"type": "ActionSet","actions": [{"type":"Action.Submit","title":"Submit"}]}],"$schema": "http://adaptivecards.io/schemas/adaptive-card.json","version":"1.0"}]==],
-                                function(data, rawData)
-                                    if data.firstname == '' or data.lastname == '' or data.dateofbirth == '' or data.sex ==
-                                        '' or data.height == '' then
-                                        deferrals.done(_U('data_incorrect'))
-                                    else
-                                        if checkNameFormat(data.firstname) and checkNameFormat(data.lastname) and
-                                            checkDOBFormat(data.dateofbirth) and checkSexFormat(data.sex) and
-                                            checkHeightFormat(data.height) then
-                                            playerIdentity[identifier] = {
-                                                firstName = formatName(data.firstname),
-                                                lastName = formatName(data.lastname),
-                                                dateOfBirth = data.dateofbirth,
-                                                sex = data.sex,
-                                                height = tonumber(data.height),
-                                                saveToDatabase = true
-                                            }
-
-                                            deferrals.done()
-                                        else
-                                            deferrals.done(_U('invalid_format'))
-                                        end
-                                    end
-                                end)
-                        end
-                    else
-                        deferrals.presentCard(
-                            [==[{"type": "AdaptiveCard","body":[{"type":"Container","items":[{"type":"ColumnSet","columns":[{"type":"Column","items":[{"type":"Input.Text","placeholder":"First Name","id":"firstname","maxLength":15},{"type":"Input.Text","placeholder":"Date of Birth (MM/DD/YYYY)","id":"dateofbirth","maxLength":10}],"width":"stretch"},{"type":"Column","width":"stretch","items":[{"type":"Input.Text","placeholder":"Last Name","id":"lastname","maxLength":15},{"type":"Input.Text","placeholder":"Height (48-96 inches)","id":"height","maxLength":2}]}]},{"type":"Input.ChoiceSet","placeholder":"Sex","choices":[{"title":"Male","value":"m"},{"title":"Female","value":"f"}],"style":"expanded","id":"sex"}]},{"type": "ActionSet","actions": [{"type":"Action.Submit","title":"Submit"}]}],"$schema": "http://adaptivecards.io/schemas/adaptive-card.json","version":"1.0"}]==],
-                            function(data, rawData)
-                                if data.firstname == '' or data.lastname == '' or data.dateofbirth == '' or data.sex ==
-                                    '' or data.height == '' then
-                                    deferrals.done(_U('data_incorrect'))
-                                else
-                                    if checkNameFormat(data.firstname) and checkNameFormat(data.lastname) and
-                                        checkDOBFormat(data.dateofbirth) and checkSexFormat(data.sex) and
-                                        checkHeightFormat(data.height) then
-                                        playerIdentity[identifier] = {
-                                            firstName = formatName(data.firstname),
-                                            lastName = formatName(data.lastname),
-                                            dateOfBirth = data.dateofbirth,
-                                            sex = data.sex,
-                                            height = tonumber(data.height),
-                                            saveToDatabase = true
-                                        }
-
-                                        deferrals.done()
-                                    else
-
-                                        deferrals.done(_U('invalid_format'))
-                                    end
-                                end
-                            end)
-                    end
-                end)
-        else
-            deferrals.done(_U('no_identifier'))
-        end
-    end)
-
-    RegisterNetEvent('esx:playerLoaded')
-    AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
-        if playerIdentity[xPlayer.identifier] then
-            local currentIdentity = playerIdentity[xPlayer.identifier]
-
-            xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
-            xPlayer.set('firstName', currentIdentity.firstName)
-            xPlayer.set('lastName', currentIdentity.lastName)
-            xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
-            xPlayer.set('sex', currentIdentity.sex)
-            xPlayer.set('height', currentIdentity.height)
-
-            if currentIdentity.saveToDatabase then
-                saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
-            end
-
-            Wait(0)
-            alreadyRegistered[xPlayer.identifier] = true
-            TriggerClientEvent('esx_identity:alreadyRegistered', xPlayer.source)
-
-            playerIdentity[xPlayer.identifier] = nil
-        else
-            xPlayer.kick(_('missing_identity'))
-        end
-    end)
-
-elseif not Config.UseDeferrals then
-    if not multichar then
-        AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
-            deferrals.defer()
-            local playerId, identifier = source, ESX.GetIdentifier(source)
-            Wait(40)
-
-            if identifier then
-                MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
-                    {identifier}, function(result)
-                        if result then
-                            if result.firstname then
-                                playerIdentity[identifier] = {
-                                    firstName = result.firstname,
-                                    lastName = result.lastname,
-                                    dateOfBirth = result.dateofbirth,
-                                    sex = result.sex,
-                                    height = result.height
-                                }
-
-                                alreadyRegistered[identifier] = true
-
-                                deferrals.done()
-                            else
-                                playerIdentity[identifier] = nil
-                                alreadyRegistered[identifier] = false
-                                deferrals.done()
-                            end
-                        else
-                            playerIdentity[identifier] = nil
-                            alreadyRegistered[identifier] = false
-                            deferrals.done()
-                        end
-                    end)
-            else
-                deferrals.done(_U('no_identifier'))
-            end
-        end)
-
-        AddEventHandler('onResourceStart', function(resource)
-            if resource == GetCurrentResourceName() then
-                Wait(300)
-
-                while not ESX do
-                    Wait(0)
-                end
-
-                local xPlayers = ESX.GetExtendedPlayers()
-                for _, xPlayer in pairs(xPlayers) do
-                    if xPlayer then
-                        checkIdentity(xPlayer)
-                    end
-                end
-            end
-        end)
-
-        RegisterNetEvent('esx:playerLoaded')
-        AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
-            local currentIdentity = playerIdentity[xPlayer.identifier]
-            if currentIdentity and alreadyRegistered[xPlayer.identifier] == true then
-
-                xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
-                xPlayer.set('firstName', currentIdentity.firstName)
-                xPlayer.set('lastName', currentIdentity.lastName)
-                xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
-                xPlayer.set('sex', currentIdentity.sex)
-                xPlayer.set('height', currentIdentity.height)
-
-                if currentIdentity.saveToDatabase then
-                    saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
-                end
-
-                Wait(0)
-                TriggerClientEvent('esx_identity:alreadyRegistered', xPlayer.source)
-
-                playerIdentity[xPlayer.identifier] = nil
-            else
-                TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
-            end
-        end)
-    end
-
-    ESX.RegisterServerCallback('esx_identity:registerIdentity', function(source, cb, data)
-        local xPlayer = ESX.GetPlayerFromId(source)
-
-        if xPlayer then
-            if not alreadyRegistered[xPlayer.identifier] then
-                if checkNameFormat(data.firstname) and checkNameFormat(data.lastname) and checkSexFormat(data.sex) and
-                    checkDOBFormat(data.dateofbirth) and checkHeightFormat(data.height) then
-                    playerIdentity[xPlayer.identifier] = {
-                        firstName = formatName(data.firstname),
-                        lastName = formatName(data.lastname),
-                        dateOfBirth = data.dateofbirth,
-                        sex = data.sex,
-                        height = data.height
-                    }
-
-                    local currentIdentity = playerIdentity[xPlayer.identifier]
-
-                    xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
-                    xPlayer.set('firstName', currentIdentity.firstName)
-                    xPlayer.set('lastName', currentIdentity.lastName)
-                    xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
-                    xPlayer.set('sex', currentIdentity.sex)
-                    xPlayer.set('height', currentIdentity.height)
-
-                    saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
-                    alreadyRegistered[xPlayer.identifier] = true
-
-                    playerIdentity[xPlayer.identifier] = nil
-                    cb(true)
-                else
-                    xPlayer.showNotification(_U('invalid_format'), "error")
-                    cb(false)
-                end
-            else
-                cb(false)
-            end
-        else
-            if multichar and checkNameFormat(data.firstname) and checkNameFormat(data.lastname) and
-                checkSexFormat(data.sex) and checkDOBFormat(data.dateofbirth) and checkHeightFormat(data.height) then
-                TriggerEvent('esx_identity:completedRegistration', source, data)
-                cb(true)
-            else 
-                TriggerClientEvent("esx:showNotification", source, _U('data_incorrect'), "error")
-            end
-        end
-    end)
-
-    function checkIdentity(xPlayer)
-        MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
-            {xPlayer.identifier}, function(result)
-                if result then
-                    if result.firstname then
-                        playerIdentity[xPlayer.identifier] = {
-                            firstName = result.firstname,
-                            lastName = result.lastname,
-                            dateOfBirth = result.dateofbirth,
-                            sex = result.sex,
-                            height = result.height
-                        }
-
-                        alreadyRegistered[xPlayer.identifier] = true
-
-                        setIdentity(xPlayer)
-                    else
-                        playerIdentity[xPlayer.identifier] = nil
-                        alreadyRegistered[xPlayer.identifier] = false
-                        TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
-                    end
-                else
-                    TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
-                end
-            end)
-    end
-
-    function setIdentity(xPlayer)
-        if alreadyRegistered[xPlayer.identifier] then
-            local currentIdentity = playerIdentity[xPlayer.identifier]
-
-            xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
-            xPlayer.set('firstName', currentIdentity.firstName)
-            xPlayer.set('lastName', currentIdentity.lastName)
-            xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
-            xPlayer.set('sex', currentIdentity.sex)
-            xPlayer.set('height', currentIdentity.height)
-
-            if currentIdentity.saveToDatabase then
-                saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
-            end
-
-            playerIdentity[xPlayer.identifier] = nil
-        end
-    end
-end
-
-if Config.EnableCommands then
-    ESX.RegisterCommand('char', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.getName() then
-            xPlayer.showNotification(_U('active_character', xPlayer.getName()))
-        else
-            xPlayer.showNotification(_U('error_active_character'))
-        end
-    end, false, {
-        help = _U('show_active_character')
-    })
-
-    ESX.RegisterCommand('chardel', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.getName() then
-            if Config.UseDeferrals then
-                xPlayer.kick(_U('deleted_identity'))
-                Wait(1500)
-                deleteIdentity(xPlayer)
-                xPlayer.showNotification(_U('deleted_character'))
-                playerIdentity[xPlayer.identifier] = nil
-                alreadyRegistered[xPlayer.identifier] = false
-            else
-                deleteIdentity(xPlayer)
-                xPlayer.showNotification(_U('deleted_character'))
-                playerIdentity[xPlayer.identifier] = nil
-                alreadyRegistered[xPlayer.identifier] = false
-                TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
-            end
-        else
-            xPlayer.showNotification(_U('error_delete_character'))
-        end
-    end, false, {
-        help = _U('delete_character')
-    })
-end
-
-if Config.EnableDebugging then
-    ESX.RegisterCommand('xPlayerGetFirstName', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.get('firstName') then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_first_name', xPlayer.get('firstName')))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_first_name'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_first_name')
-    })
-
-    ESX.RegisterCommand('xPlayerGetLastName', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.get('lastName') then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_last_name', xPlayer.get('lastName')))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_last_name'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_last_name')
-    })
-
-    ESX.RegisterCommand('xPlayerGetFullName', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.getName() then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_full_name', xPlayer.getName()))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_full_name'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_full_name')
-    })
-
-    ESX.RegisterCommand('xPlayerGetSex', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.get('sex') then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_sex', xPlayer.get('sex')))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_sex'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_sex')
-    })
-
-    ESX.RegisterCommand('xPlayerGetDOB', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.get('dateofbirth') then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_dob', xPlayer.get('dateofbirth')))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_dob'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_dob')
-    })
-
-    ESX.RegisterCommand('xPlayerGetHeight', 'user', function(xPlayer, args, showError)
-        if xPlayer and xPlayer.get('height') then
-            xPlayer.showNotification(_U('return_debug_xPlayer_get_height', xPlayer.get('height')))
-        else
-            xPlayer.showNotification(_U('error_debug_xPlayer_get_height'))
-        end
-    end, false, {
-        help = _U('debug_xPlayer_get_height')
-    })
-end
-
-function deleteIdentity(xPlayer)
+local function deleteIdentity(xPlayer)
     if alreadyRegistered[xPlayer.identifier] then
         xPlayer.setName(('%s %s'):format(nil, nil))
         xPlayer.set('firstName', nil)
@@ -395,13 +15,13 @@ function deleteIdentity(xPlayer)
     end
 end
 
-function saveIdentityToDatabase(identifier, identity)
+local function saveIdentityToDatabase(identifier, identity)
     MySQL.update.await(
         'UPDATE users SET firstname = ?, lastname = ?, dateofbirth = ?, sex = ?, height = ? WHERE identifier = ?',
         {identity.firstName, identity.lastName, identity.dateOfBirth, identity.sex, identity.height, identifier})
 end
 
-function deleteIdentityFromDatabase(xPlayer)
+local function deleteIdentityFromDatabase(xPlayer)
     MySQL.query.await(
         'UPDATE users SET firstname = ?, lastname = ?, dateofbirth = ?, sex = ?, height = ?, skin = ? WHERE identifier = ?',
         {nil, nil, nil, nil, nil, nil, xPlayer.identifier})
@@ -415,77 +35,14 @@ function deleteIdentityFromDatabase(xPlayer)
     end
 end
 
-function checkNameFormat(name)
-    if not checkAlphanumeric(name) then
-        if not checkForNumbers(name) then
-            local stringLength = string.len(name)
-            if stringLength > 0 and stringLength < Config.MaxNameLength then
-                return true
-            else
-                return false
-            end
-        else
-            return false
-        end
-    else
-        return false
-    end
-end
-
-function checkDOBFormat(dob)
-    local date = tostring(dob)
-    if checkDate(date) then
-        return true
-    else
-        return false
-    end
-end
-
-function checkSexFormat(sex)
-    if sex == "m" or sex == "M" or sex == "f" or sex == "F" then
-        return true
-    else
-        return false
-    end
-end
-
-function checkHeightFormat(height)
-    local numHeight = tonumber(height)
-    if numHeight < Config.MinHeight and numHeight > Config.MaxHeight then
-        return false
-    else
-        return true
-    end
-end
-
-function formatName(name)
-    local loweredName = convertToLowerCase(name)
-    local formattedName = convertFirstLetterToUpper(loweredName)
-    return formattedName
-end
-
-function convertToLowerCase(str)
-    return string.lower(str)
-end
-
-function convertFirstLetterToUpper(str)
-    return str:gsub("^%l", string.upper)
-end
-
-function checkAlphanumeric(str)
-    return (string.match(str, "%W"))
-end
-
-function checkForNumbers(str)
-    return (string.match(str, "%d"))
-end
-
-function checkDate(str)
+local function checkDate(str)
     if string.match(str, '(%d%d)/(%d%d)/(%d%d%d%d)') ~= nil then
         local d, m, y = string.match(str, '(%d+)/(%d+)/(%d+)')
+        
         m = tonumber(m)
         d = tonumber(d)
         y = tonumber(y)
+
         if ((d <= 0) or (d > 31)) or ((m <= 0) or (m > 12)) or ((y <= Config.LowestYear) or (y > Config.HighestYear)) then
             return false
         elseif m == 4 or m == 6 or m == 9 or m == 11 then
@@ -519,3 +76,533 @@ function checkDate(str)
         return false
     end
 end
+
+local function formatDate(str)
+    local d, m, y = string.match(str, '(%d+)/(%d+)/(%d+)')
+    local date = str
+
+    if Config.DateFormat == "MM/DD/YYYY" then
+        date = m .. "/" .. d .. "/" .. y
+    elseif Config.DateFormat == "YYYY/MM/DD" then
+        date = y .. "/" .. m .. "/" .. d
+    end
+
+    return date
+end
+
+local function checkAlphanumeric(str)
+    return (string.match(str, "%W"))
+end
+
+local function checkForNumbers(str)
+    return (string.match(str, "%d"))
+end
+
+local function checkNameFormat(name)
+    if not checkAlphanumeric(name) then
+        if not checkForNumbers(name) then
+            local stringLength = string.len(name)
+            if stringLength > 0 and stringLength < Config.MaxNameLength then
+                return true
+            else
+                return false
+            end
+        else
+            return false
+        end
+    else
+        return false
+    end
+end
+
+local function checkDOBFormat(dob)
+    local date = tostring(dob)
+
+    if checkDate(date) then
+        return true
+    else
+        return false
+    end
+end
+
+local function checkSexFormat(sex)
+    if sex == "m" or sex == "M" or sex == "f" or sex == "F" then
+        return true
+    else
+        return false
+    end
+end
+
+local function checkHeightFormat(height)
+    local numHeight = tonumber(height)
+    if numHeight < Config.MinHeight and numHeight > Config.MaxHeight then
+        return false
+    else
+        return true
+    end
+end
+
+local function convertToLowerCase(str)
+    return string.lower(str)
+end
+
+local function convertFirstLetterToUpper(str)
+    return str:gsub("^%l", string.upper)
+end
+
+local function formatName(name)
+    local loweredName = convertToLowerCase(name)
+    local formattedName = convertFirstLetterToUpper(loweredName)
+    return formattedName
+end
+
+if Config.UseDeferrals then
+    AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
+        deferrals.defer()
+        local playerId, identifier = source, ESX.GetIdentifier(source)
+        Wait(100)
+
+        if identifier then
+            MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
+                {identifier}, function(result)
+                    if result then
+                        if result.firstname then
+                            playerIdentity[identifier] = {
+                                firstName = result.firstname,
+                                lastName = result.lastname,
+                                dateOfBirth = result.dateofbirth,
+                                sex = result.sex,
+                                height = result.height
+                            }
+
+                            deferrals.done()
+                        else
+                            deferrals.presentCard(
+                                [==[{"type": "AdaptiveCard","body":[{"type":"Container","items":[{"type":"ColumnSet",
+                                "columns":[{"type":"Column","items":[{"type":"Input.Text","placeholder":"First Name",
+                                "id":"firstname","maxLength":15},{"type":"Input.Text","placeholder":"Date of Birth (MM/DD/YYYY)",
+                                "id":"dateofbirth","maxLength":10}],"width":"stretch"},{"type":"Column","width":"stretch",
+                                "items":[{"type":"Input.Text","placeholder":"Last Name","id":"lastname","maxLength":15},
+                                {"type":"Input.Text","placeholder":"Height (48-96 inches)","id":"height","maxLength":2}]}]},
+                                {"type":"Input.ChoiceSet","placeholder":"Sex","choices":[{"title":"Male","value":"m"},
+                                {"title":"Female","value":"f"}],"style":"expanded","id":"sex"}]},{"type": "ActionSet",
+                                "actions": [{"type":"Action.Submit","title":"Submit"}]}],
+                                "$schema": "http://adaptivecards.io/schemas/adaptive-card.json","version":"1.0"}]==],
+                                function(data, rawData)
+                                    if data.firstname == '' or data.lastname == '' or data.dateofbirth == '' or data.sex ==
+                                        '' or data.height == '' then
+                                        deferrals.done(_U('data_incorrect'))
+                                    else
+                                        if checkNameFormat(data.firstname) and checkNameFormat(data.lastname) and
+                                            checkDOBFormat(data.dateofbirth) and checkSexFormat(data.sex) and
+                                            checkHeightFormat(data.height) then
+                                            playerIdentity[identifier] = {
+                                                firstName = formatName(data.firstname),
+                                                lastName = formatName(data.lastname),
+                                                dateOfBirth = data.dateofbirth,
+                                                sex = data.sex,
+                                                height = tonumber(data.height),
+                                                saveToDatabase = true
+                                            }
+
+                                            deferrals.done()
+                                        else
+                                            deferrals.done(_U('invalid_format'))
+                                        end
+                                    end
+                                end)
+                        end
+                    else
+                        deferrals.presentCard(
+                            [==[{"type": "AdaptiveCard","body":[{"type":"Container","items":[{"type":"ColumnSet","columns":[{
+                            "type":"Column","items":[{"type":"Input.Text","placeholder":"First Name","id":"firstname",
+                            "maxLength":15},{"type":"Input.Text","placeholder":"Date of Birth (MM/DD/YYYY)","id":"dateofbirth",
+                            "maxLength":10}],"width":"stretch"},{"type":"Column","width":"stretch","items":[{"type":"Input.Text",
+                            "placeholder":"Last Name","id":"lastname","maxLength":15},{"type":"Input.Text",
+                            "placeholder":"Height (48-96 inches)","id":"height","maxLength":2}]}]},{"type":"Input.ChoiceSet",
+                            "placeholder":"Sex","choices":[{"title":"Male","value":"m"},{"title":"Female","value":"f"}],
+                            "style":"expanded","id":"sex"}]},{"type": "ActionSet","actions": [{"type":"Action.Submit",
+                            "title":"Submit"}]}],"$schema": "http://adaptivecards.io/schemas/adaptive-card.json","version":"1.0"}]==],
+                            function(data, rawData)
+                                if data.firstname == '' or data.lastname == '' or data.dateofbirth == '' or data.sex ==
+                                    '' or data.height == '' then
+                                    deferrals.done(_U('data_incorrect'))
+                                else
+                                    if checkNameFormat(date.firstname) then
+                                        if checkNameFormat(data.lastname) then
+                                            if checkDOBFormat(data.dateofbirth) then
+                                                if checkSexFormat(data.sex) then
+                                                    if checkHeightFormat(data.height) then
+                                                        local formattedFirstName = formatName(data.firstname)
+                                                        local formattedLastName = formatName(data.lastname)
+                                                        local formattedDate = formatDate(data.dateofbirth)
+
+                                                        playerIdentity[identifier] = {
+                                                            firstName = formatName(data.firstname),
+                                                            lastName = formatName(data.lastname),
+                                                            dateOfBirth = data.dateofbirth,
+                                                            sex = data.sex,
+                                                            height = tonumber(data.height),
+                                                            saveToDatabase = true
+                                                        }
+
+                                                        deferrals.done()
+                                                    else
+                                                        deferrals.done(_U('invalid_height_format'))
+                                                    end
+                                                else
+                                                    deferrals.done(_U('invalid_sex_format'))
+                                                end
+                                            else
+                                                deferrals.done(_U('invalid_dob_format'))
+                                            end
+                                        else
+                                            deferrals.done(_U('invalid_lastname_format'))
+                                        end
+                                    else
+                                        deferrals.done(_U('invalid_firstname_format'))
+                                    end
+                                end
+                            end)
+                    end
+                end)
+        else
+            deferrals.done(_U('no_identifier'))
+        end
+    end)
+
+    RegisterNetEvent('esx:playerLoaded')
+    AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
+        if playerIdentity[xPlayer.identifier] then
+            local currentIdentity = playerIdentity[xPlayer.identifier]
+            xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
+            xPlayer.set('firstName', currentIdentity.firstName)
+            xPlayer.set('lastName', currentIdentity.lastName)
+            xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
+            xPlayer.set('sex', currentIdentity.sex)
+            xPlayer.set('height', currentIdentity.height)
+
+            if currentIdentity.saveToDatabase then
+                saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
+            end
+
+            Wait(0)
+            alreadyRegistered[xPlayer.identifier] = true
+            TriggerClientEvent('esx_identity:alreadyRegistered', xPlayer.source)
+
+            playerIdentity[xPlayer.identifier] = nil
+        else
+            xPlayer.kick(_('missing_identity'))
+        end
+    end)
+else
+	local function checkIdentity(xPlayer)
+		MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
+            {xPlayer.identifier}, function(result)
+                if result then
+                    if result.firstname then
+                        playerIdentity[xPlayer.identifier] = {
+                            firstName = result.firstname,
+                            lastName = result.lastname,
+                            dateOfBirth = result.dateofbirth,
+                            sex = result.sex,
+                            height = result.height
+                        }
+        
+                        alreadyRegistered[xPlayer.identifier] = true
+                        setIdentity(xPlayer)
+                    else
+                        playerIdentity[xPlayer.identifier] = nil
+                        alreadyRegistered[xPlayer.identifier] = false
+                        TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
+                    end
+                else
+                    TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
+                end
+            end)
+	end
+
+	local function setIdentity(xPlayer)
+		if alreadyRegistered[xPlayer.identifier] then
+			local currentIdentity = playerIdentity[xPlayer.identifier]
+
+			xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
+			xPlayer.set('firstName', currentIdentity.firstName)
+			xPlayer.set('lastName', currentIdentity.lastName)
+			xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
+			xPlayer.set('sex', currentIdentity.sex)
+			xPlayer.set('height', currentIdentity.height)
+
+			if currentIdentity.saveToDatabase then
+				saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
+			end
+
+			playerIdentity[xPlayer.identifier] = nil
+		end
+	end
+
+	if not multichar then
+		AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
+			deferrals.defer()
+			local playerId, identifier = source, ESX.GetIdentifier(source)
+			Wait(40)
+
+			if identifier then
+				MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
+				    {identifier}, function(result)
+                        if result then
+                            if result.firstname then
+                                playerIdentity[identifier] = {
+                                    firstName = result.firstname,
+                                    lastName = result.lastname,
+                                    dateOfBirth = result.dateofbirth,
+                                    sex = result.sex,
+                                    height = result.height
+                                }
+
+                                alreadyRegistered[identifier] = true
+
+                                deferrals.done()
+                            else
+                                playerIdentity[identifier] = nil
+                                alreadyRegistered[identifier] = false
+                                deferrals.done()
+                            end
+                        else
+                            playerIdentity[identifier] = nil
+                            alreadyRegistered[identifier] = false
+                            deferrals.done()
+                        end
+                    end)
+			else
+				deferrals.done(_U('no_identifier'))
+			end
+		end)
+
+		AddEventHandler('onResourceStart', function(resource)
+            if resource == GetCurrentResourceName() then
+                Wait(300)
+
+                while not ESX do Wait(0) end
+
+                local xPlayers = ESX.GetExtendedPlayers()
+
+                for _, xPlayer in pairs(xPlayers) do
+                    if xPlayer then
+                        checkIdentity(xPlayer)
+                    end
+                end
+            end
+        end)
+
+		RegisterNetEvent('esx:playerLoaded', function(playerId, xPlayer)
+			local currentIdentity = playerIdentity[xPlayer.identifier]
+
+            if currentIdentity and alreadyRegistered[xPlayer.identifier] == true then
+                xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
+                xPlayer.set('firstName', currentIdentity.firstName)
+                xPlayer.set('lastName', currentIdentity.lastName)
+                xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
+                xPlayer.set('sex', currentIdentity.sex)
+                xPlayer.set('height', currentIdentity.height)
+
+                if currentIdentity.saveToDatabase then
+                    saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
+                end
+
+                Wait(0)
+
+                TriggerClientEvent('esx_identity:alreadyRegistered', xPlayer.source)
+
+                playerIdentity[xPlayer.identifier] = nil
+            else
+                TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
+            end
+		end)
+	end
+
+	ESX.RegisterServerCallback('esx_identity:registerIdentity', function(source, cb, data)
+		local xPlayer = ESX.GetPlayerFromId(source)
+
+		if xPlayer then
+			if not alreadyRegistered[xPlayer.identifier] then
+                xPlayer.showNotification(_U('running'), "error")
+				if checkNameFormat(data.firstname) then
+					if checkNameFormat(data.lastname) then
+						if checkSexFormat(data.sex) then
+							if checkDOBFormat(data.dateofbirth) then
+								if checkHeightFormat(data.height) then
+									local formattedFirstName = formatName(data.firstname)
+									local formattedLastName = formatName(data.lastname)
+                                    local formattedDate = formatDate(data.dateofbirth)
+
+									playerIdentity[xPlayer.identifier] = {
+										firstName = formattedFirstName,
+										lastName = formattedLastName,
+										dateOfBirth = formattedDate,
+										sex = data.sex,
+										height = data.height
+									}
+
+									local currentIdentity = playerIdentity[xPlayer.identifier]
+
+									xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
+									xPlayer.set('firstName', currentIdentity.firstName)
+									xPlayer.set('lastName', currentIdentity.lastName)
+									xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
+									xPlayer.set('sex', currentIdentity.sex)
+									xPlayer.set('height', currentIdentity.height)
+									saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
+									alreadyRegistered[xPlayer.identifier] = true
+									playerIdentity[xPlayer.identifier] = nil
+
+									cb(true)
+								else
+									xPlayer.showNotification(_U('invalid_height_format'), "error")
+									cb(false)
+								end
+							else
+								xPlayer.showNotification(_U('invalid_dob_format'), "error")
+								cb(false)
+							end
+						else
+							xPlayer.showNotification(_U('invalid_sex_format'), "error")
+							cb(false)
+						end
+					else
+						xPlayer.showNotification(_U('invalid_lastname_format'), "error")
+						cb(false)
+					end
+				else
+					xPlayer.showNotification(_U('invalid_firstname_format'), "error")
+					cb(false)
+				end
+			else
+				xPlayer.showNotification(_U('already_registered'), "error")
+				cb(false)
+			end
+		else
+			if multichar then
+				if checkNameFormat(data.firstname) then
+					if checkNameFormat(data.lastname) then
+						if checkSexFormat(data.sex) then
+							if checkDOBFormat(data.dateofbirth) then
+                                local formattedFirstName = formatName(data.firstname)
+                                local formattedLastName = formatName(data.lastname)
+                                local formattedDate = formatDate(data.dateofbirth)
+             
+                                data.firstname = formattedFirstName
+                                data.lastname = formattedLastName
+                                data.dateofbirth = formattedDate
+
+								if checkHeightFormat(data.height) then
+									TriggerEvent('esx_identity:completedRegistration', source, data)
+									cb(true)
+								else
+									TriggerClientEvent("esx:showNotification", source, _U('invalid_height_format'), "error")
+									cb(false)
+								end
+							else
+								TriggerClientEvent("esx:showNotification", source, _U('invalid_dob_format'), "error")
+								cb(false)
+							end
+						else
+							TriggerClientEvent("esx:showNotification", source, _U('invalid_sex_format'), "error")
+							cb(false)
+						end
+					else
+						TriggerClientEvent("esx:showNotification", source, _U('invalid_lastname_format'), "error")
+						cb(false)
+					end
+				else
+					TriggerClientEvent("esx:showNotification", source, _U('invalid_firstname_format'), "error")
+					cb(false)
+				end
+			else
+				TriggerClientEvent("esx:showNotification", source, _U('data_incorrect'), "error")
+                cb(false)
+			end
+		end
+	end)
+end
+
+if Config.EnableCommands then
+	ESX.RegisterCommand('char', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.getName() then
+            xPlayer.showNotification(_U('active_character', xPlayer.getName()))
+        else
+            xPlayer.showNotification(_U('error_active_character'))
+        end
+    end, false, {help = _U('show_active_character')})
+
+	ESX.RegisterCommand('chardel', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.getName() then
+            if Config.UseDeferrals then
+                xPlayer.kick(_U('deleted_identity'))
+                Wait(1500)
+                deleteIdentity(xPlayer)
+                xPlayer.showNotification(_U('deleted_character'))
+                playerIdentity[xPlayer.identifier] = nil
+                alreadyRegistered[xPlayer.identifier] = false
+            else
+                deleteIdentity(xPlayer)
+                xPlayer.showNotification(_U('deleted_character'))
+                playerIdentity[xPlayer.identifier] = nil
+                alreadyRegistered[xPlayer.identifier] = false
+                TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
+            end
+        else
+            xPlayer.showNotification(_U('error_delete_character'))
+        end
+    end, false, {help = _U('delete_character')})
+end
+
+if Config.EnableDebugging then
+    ESX.RegisterCommand('xPlayerGetFirstName', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.get('firstName') then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_first_name', xPlayer.get('firstName')))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_first_name'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_first_name')})
+
+    ESX.RegisterCommand('xPlayerGetLastName', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.get('lastName') then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_last_name', xPlayer.get('lastName')))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_last_name'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_last_name')})
+
+    ESX.RegisterCommand('xPlayerGetFullName', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.getName() then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_full_name', xPlayer.getName()))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_full_name'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_full_name')})
+
+    ESX.RegisterCommand('xPlayerGetSex', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.get('sex') then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_sex', xPlayer.get('sex')))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_sex'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_sex')})
+
+    ESX.RegisterCommand('xPlayerGetDOB', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.get('dateofbirth') then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_dob', xPlayer.get('dateofbirth')))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_dob'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_dob')})
+
+    ESX.RegisterCommand('xPlayerGetHeight', 'user', function(xPlayer, args, showError)
+        if xPlayer and xPlayer.get('height') then
+            xPlayer.showNotification(_U('return_debug_xPlayer_get_height', xPlayer.get('height')))
+        else
+            xPlayer.showNotification(_U('error_debug_xPlayer_get_height'))
+        end
+    end, false, {help = _U('debug_xPlayer_get_height')})
+end