diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm
index 855c70dafa..a452446e46 100644
--- a/code/game/verbs/advanced_who.dm
+++ b/code/game/verbs/advanced_who.dm
@@ -53,30 +53,22 @@
 			Lines += entry
 	else
 		for(var/client/C in clients)
+			var/entry = "\t"
 			if(C.holder && C.holder.fakekey)
-				var/entry = "\t[C.key]"
-				var/mob/observer/dead/O = C.mob
-				entry = C.holder.fakekey
-				if(isobserver(O))
-					entry += " - <font color='gray'>Observing</font>"
-				else if(istype(O,/mob/new_player))
-					entry += " - <font color='blue'>In Lobby</font>"
-				else
-					entry += " - <font color='green'>Playing</font>"
-				Lines += entry
+				entry += "[C.holder.fakekey]"
 			else
-				var/entry = "\t[C.key]"
-				var/mob/observer/dead/O = C.mob
-				if(isobserver(O)) //Woo, players can see
-					entry += " - <font color='gray'>Observing</font>"
-				else if(istype(O,/mob/new_player))
-					entry += " - <font color='blue'>In Lobby</font>"
-				else
-					entry += " - <font color='green'>Playing</font>"
-				Lines += entry
+				entry += "[C.key]"
+			var/mob/observer/dead/O = C.mob
+			if(isobserver(O))
+				entry += " - <font color='gray'>Observing</font>"
+			else if(istype(O,/mob/new_player))
+				entry += " - <font color='blue'>In Lobby</font>"
+			else
+				entry += " - <font color='green'>Playing</font>"
+			Lines += entry
 
 	for(var/line in sortList(Lines))
 		msg += "[line]\n"
 
 	msg += "<b>Total Players: [length(Lines)]</b>"
-	src << msg
+	to_chat(src, msg)
\ No newline at end of file