diff --git a/src/services/LoginService.java b/src/services/LoginService.java
index 6e54624c..04f8fb97 100644
--- a/src/services/LoginService.java
+++ b/src/services/LoginService.java
@@ -151,6 +151,8 @@ public class LoginService implements INetworkDispatch{
 				client.setSessionKey(generateSessionKey());
 				client.setAccountId(id);
 				client.setSession(session);
+				String accessLevel = core.adminService.getAccessLevelFromDB(id);
+				if (accessLevel != null && !accessLevel.equals("")) { client.setAccessLevel(accessLevel); }
 				
 				core.addClient(session, client);
 				
diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index ea56a687..20e19e6a 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -689,7 +689,7 @@ public class CommandService implements INetworkDispatch  {
 	public void processCommand(CreatureObject actor, SWGObject target, BaseSWGCommand command, int actionCounter, String commandArgs) {
 		
 		if (command.getGodLevel() > 0 || command.getCommandName().equals("setgodmode")) {
-			String accessLevel = core.adminService.getAccessLevelFromDB(actor.getClient().getAccountId());
+			String accessLevel = actor.getClient().getAccessLevel();
 			String filePath = "accesslevels/" + accessLevel + ".txt";
 			
 			if(FileUtilities.doesFileExist(filePath)) {