diff --git a/__resource.lua b/__resource.lua
index cfa44c60..953bf74a 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -29,6 +29,7 @@ server_scripts {
 	'server/commands.lua',
 
 	'common/modules/math.lua',
+	'common/modules/table.lua',
 	'common/functions.lua'
 }
 
@@ -57,6 +58,7 @@ client_scripts {
 	'client/modules/streaming.lua',
 
 	'common/modules/math.lua',
+	'common/modules/table.lua',
 	'common/functions.lua'
 }
 
diff --git a/common/modules/table.lua b/common/modules/table.lua
new file mode 100644
index 00000000..fa65baa4
--- /dev/null
+++ b/common/modules/table.lua
@@ -0,0 +1,132 @@
+-- nil proof alternative to #table
+function ESX.Table.SizeOf(table)
+	local keys = {}
+
+	for k,v in pairs(table) do
+		table.insert(keys, tonumber(k))
+	end
+
+	table.sort(keys, function(a,b) return a < b end)
+
+	if #keys > 0 then
+		return keys[#keys]
+	else
+		return 0
+	end
+end
+
+function ESX.Table.IndexOf(table, value)
+	for i=1, #table, 1 do
+		if table[i] == value then
+			return i
+		end
+	end
+
+	return -1
+end
+
+function ESX.Table.LastIndexOf(table, value)
+	for i=#table, 1, -1 do
+		if table[i] == value then
+			return i
+		end
+	end
+
+	return -1
+end
+
+function ESX.Table.Find(table, cb)
+	for i=1, #table, 1 do
+		if cb(table[i]) then
+			return table[i]
+		end
+	end
+
+	return nil
+end
+
+function ESX.Table.FindIndex(table, cb)
+	for i=1, #table, 1 do
+		if cb(table[i]) then
+			return i
+		end
+	end
+
+	return -1
+end
+
+function ESX.Table.Filter(table, cb)
+	local newTable = {}
+
+	for i=1, #table, 1 do
+		if cb(table[i]) then
+			table.insert(newTable, table[i])
+		end
+	end
+
+	return newTable
+end
+
+function ESX.Table.Map(table, cb)
+	local newTable = {}
+
+	for i=1, #table, 1 do
+		newTable[i] = cb(table[i], i)
+	end
+
+	return newTable
+end
+
+function ESX.Table.Reverse(table)
+	local newTable = {}
+
+	for i=#table, 1, -1 do
+		table.insert(newTable, table[i])
+	end
+
+	return newTable
+end
+
+function ESX.Table.Clone(table)
+	if type(table) ~= 'table' then return table end
+
+	local meta = getmetatable(table)
+	local target = {}
+
+	for k,v in pairs(table) do
+		if type(v) == 'table' then
+			target[k] = ESX.Table.Clone(v)
+		else
+			target[k] = v
+		end
+	end
+
+	setmetatable(target, meta)
+
+	return target
+end
+
+function ESX.Table.Concat(table1, table2)
+	local table3 = ESX.Table.Clone(table1)
+
+	for i=1, #table2, 1 do
+		table.insert(table3, table2[i])
+	end
+
+	return t3
+end
+
+function ESX.Table.Join(table, sep)
+	local sep = sep or ','
+	local str = ''
+
+	for i=1, #table, 1 do
+		if i > 1 then
+			str = str .. sep
+		end
+
+		str = str .. table[i]
+	end
+
+	return str
+end
\ No newline at end of file
diff --git a/server/main.lua b/server/main.lua
index 4ac0b405..84c3ab20 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -17,7 +17,7 @@ AddEventHandler('es:playerLoaded', function(source, _player)
 		table.insert(tasks, function(cb)
 			MySQL.Async.execute('UPDATE `users` SET `name` = @name WHERE `identifier` = @identifier', {
 				['@identifier'] = player.getIdentifier(),
-				['@name']       = userData.playerName
+				['@name'] = userData.playerName
 			}, function(rowsChanged)
 				cb()
 			end)
@@ -28,7 +28,6 @@ AddEventHandler('es:playerLoaded', function(source, _player)
 			MySQL.Async.fetchAll('SELECT * FROM `user_accounts` WHERE `identifier` = @identifier', {
 				['@identifier'] = player.getIdentifier()
 			}, function(accounts)
-
 				for i=1, #Config.Accounts, 1 do
 					for j=1, #accounts, 1 do
 						if accounts[j].name == Config.Accounts[i] then
@@ -38,6 +37,8 @@ AddEventHandler('es:playerLoaded', function(source, _player)
 								label = Config.AccountLabels[accounts[j].name]
 							})
 						end
+
+						break
 					end
 				end