diff --git a/config.lua b/config.lua
index f318c5a..f304e81 100644
--- a/config.lua
+++ b/config.lua
@@ -29,7 +29,7 @@ QBConfig.Server.pvp = true -- Enable or disable pvp on the server (Ability to sh
 QBConfig.Server.discord = "" -- Discord invite link
 QBConfig.Server.checkDuplicateLicense = true -- Check for duplicate rockstar license on join
 QBConfig.Server.PermissionList = {} -- Permission list for old permission system
-QBConfig.Server.UseOldPermissionSystem = true -- Use old permissions system from the database
+QBConfig.Server.UseOldPermissionSystem = false -- Use old permissions system from the database
 QBConfig.Server.AllPermissions = {'god',} -- Table of permissions which have access to everything
 
 QBConfig.Notify = {}
diff --git a/server/player.lua b/server/player.lua
index 771e96e..a45a577 100644
--- a/server/player.lua
+++ b/server/player.lua
@@ -46,6 +46,9 @@ function QBCore.Player.CheckPlayerData(source, PlayerData)
     if not QBCore.Config.Server.UseOldPermissionSystem then
         if PlayerData.permission then ExecuteCommand(('remove_principal identifier.%s group.%s'):format(PlayerData.license, PlayerData.permission)) end
         PlayerData.permission = PlayerData.permission or 'user'
+        if IsPlayerAceAllowed(source, 'command') and IsPlayerAceAllowed(source, 'webadmin') then -- if both are true then the person has group.admin and is a system admin
+            PlayerData.permission = QBCore.Config.Server.AllPermissions[1] or 'god'
+        end
         ExecuteCommand(('add_principal identifier.%s group.%s'):format(PlayerData.license, PlayerData.permission))
         PlayerData.optin = PlayerData.optin or true
     end