diff --git a/LaunchServer/source/auth/handler/CachedAuthHandler.java b/LaunchServer/source/auth/handler/CachedAuthHandler.java
index 8280dd8..4e835b7 100644
--- a/LaunchServer/source/auth/handler/CachedAuthHandler.java
+++ b/LaunchServer/source/auth/handler/CachedAuthHandler.java
@@ -32,6 +32,7 @@
 		// Update cached access token (and username case)
 		entry.username = username;
 		entry.accessToken = accessToken;
+		entry.serverID = null;
 		return entry.uuid;
 	}
 
diff --git a/LaunchServer/source/auth/handler/FileAuthHandler.java b/LaunchServer/source/auth/handler/FileAuthHandler.java
index bf160fc..ab3432f 100644
--- a/LaunchServer/source/auth/handler/FileAuthHandler.java
+++ b/LaunchServer/source/auth/handler/FileAuthHandler.java
@@ -137,11 +137,6 @@
 	}
 
 	@LauncherAPI
-	public final Set<Map.Entry<UUID, Entry>> entrySet() {
-		return Collections.unmodifiableMap(entryMap).entrySet();
-	}
-
-	@LauncherAPI
 	protected final void addAuth(UUID uuid, Entry entry) throws IOException {
 		lock.writeLock().lock();
 		try {
@@ -156,6 +151,11 @@
 	}
 
 	@LauncherAPI
+	protected final Set<Map.Entry<UUID, Entry>> entrySet() {
+		return Collections.unmodifiableMap(entryMap).entrySet();
+	}
+
+	@LauncherAPI
 	protected abstract void readAuthFile() throws IOException;
 
 	@LauncherAPI
diff --git a/LaunchServer/source/auth/handler/MySQLAuthHandler.java b/LaunchServer/source/auth/handler/MySQLAuthHandler.java
index 4e37686..1c41ab2 100644
--- a/LaunchServer/source/auth/handler/MySQLAuthHandler.java
+++ b/LaunchServer/source/auth/handler/MySQLAuthHandler.java
@@ -50,8 +50,8 @@
 			uuidColumn, usernameColumn, accessTokenColumn, serverIDColumn, table, uuidColumn);
 		queryByUsernameSQL = String.format("SELECT %s, %s, %s, %s FROM %s WHERE %s=? LIMIT 1",
 			uuidColumn, usernameColumn, accessTokenColumn, serverIDColumn, table, usernameColumn);
-		updateAuthSQL = String.format("UPDATE %s SET %s=?, %s=? WHERE %s=? LIMIT 1",
-			table, usernameColumn, accessTokenColumn, uuidColumn);
+		updateAuthSQL = String.format("UPDATE %s SET %s=?, %s=?, %s=NULL WHERE %s=? LIMIT 1",
+			table, usernameColumn, accessTokenColumn, serverIDColumn, uuidColumn);
 		updateServerIDSQL = String.format("UPDATE %s SET %s=? WHERE %s=? LIMIT 1",
 			table, serverIDColumn, uuidColumn);