diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f257f59304f..7f862f583e7 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -128,10 +128,10 @@
 				var/obj/O = locate("landmark*Observer-Start")
 				src << "\blue Now teleporting."
 				observer.loc = O.loc
-				observer.key = key
 				if(client.prefs.be_random_name)
 					client.prefs.randomize_name()
 				observer.name = client.prefs.real_name
+				observer.key = key
 				observer.real_name = observer.name
 
 				client.prefs.copy_to_observer(observer)