diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 082296dcaf2..ed176d9aa3c 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -27,7 +27,7 @@
 	player_list |= src
 	update_Login_details()
 	world.update_status()
-
+	
 	client.images = null				//remove the images such as AIs being unable to see runes
 	client.screen = list()				//remove hud items just in case
 	if(hud_used)	qdel(hud_used)		//remove the hud objects
@@ -37,7 +37,8 @@
 	sight |= SEE_SELF
 
 	..()
-
+	if (key != client.key)
+		key = client.key
 	if(loc && !isturf(loc))
 		client.eye = loc
 		client.perspective = EYE_PERSPECTIVE