diff --git a/[core]/esx_identity/server/main.lua b/[core]/esx_identity/server/main.lua
index e28eeffb..a72e0b65 100644
--- a/[core]/esx_identity/server/main.lua
+++ b/[core]/esx_identity/server/main.lua
@@ -44,24 +44,9 @@ 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
 
-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 checkDOBFormat(str)
     str = tostring(str)
-    local format = string.match(str, "(%d+)/(%d+)/(%d+)")
-
-    if not format then
+    if not string.match(str, "(%d%d)/(%d%d)/(%d%d%d%d)") then
         return false
     end
 
@@ -71,18 +56,6 @@ local function checkDOBFormat(str)
     d = tonumber(d)
     y = tonumber(y)
 
-    if Config.DateFormat == "MM/DD/YYYY" then
-        local month = m
-        local day = d
-        m = day
-        d = month
-    elseif Config.DateFormat == "YYYY/MM/DD" then
-        local year = y
-        local day = d
-        y = day
-        d = year
-    end
-
     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
@@ -98,6 +71,19 @@ local function checkDOBFormat(str)
     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