diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index af3b39c0347..c845e21e8b8 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -263,15 +263,16 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/list/mobs = sortmobs()
 	var/list/namecounts = list()
 	var/list/pois = list()
+	var/admeme = check_rights(R_ADMIN, FALSE)
 	for(var/mob/M in mobs)
 		if(skip_mindless && (!M.mind && !M.ckey))
 			if(!isbot(M) && !iscameramob(M) && !ismegafauna(M))
 				continue
-		if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
+		if(!admeme && M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
 			continue
 		var/name = avoid_assoc_duplicate_keys(M.name, namecounts)
-		if(findtext(ckey(name), M.ckey) || isnewplayer(M))
-			name = pick(GLOB.cow_names)
+		if(!admeme && (isdead(M) && (lowertext(M.real_name) == M.ckey || lowertext(M.name) == M.ckey)))
+			name = pick(GLOB.cow_names + GLOB.carp_names + GLOB.megacarp_last_names)
 
 		if(M.real_name && M.real_name != M.name)
 			name += " \[[M.real_name]\]"
diff --git a/code/controllers/subsystem/who.dm b/code/controllers/subsystem/who.dm
index 885e7372a6d..5098a0b6602 100644
--- a/code/controllers/subsystem/who.dm
+++ b/code/controllers/subsystem/who.dm
@@ -285,7 +285,8 @@ SUBSYSTEM_DEF(who) // SS who? SS you!
 	var/admeme = check_rights_for(whoer, admin_level_to_see_all) && !(whoer.holder in GLOB.deadmins) // so deadmins can see the normal stuff
 	if(!admeme)
 		to_chat(whoer, span_alert("Hey! Admin Who is for Admins only!"))
-	Who(whoer, TRUE)
+	Who(whoer)
+	to_chat(whoer, span_alertalien("WhoPlus is broken cus its awful, so heres the normal who!"))
 
 /datum/controller/subsystem/who/proc/Who(client/whoer, admeme)
 	var/list/lines = list()
@@ -389,8 +390,8 @@ SUBSYSTEM_DEF(who) // SS who? SS you!
 			out += " the <span class='[role_span]'>[role]</span>"
 		if(where_visible)
 			out += ", in <span class='[where_span]'>[where]</span>"
-		if(pose_visible)
-			out += "<br>[FOURSPACES][pose]'"
+		if(pose_visible && pose && trim(pose) != "")
+			out += "'[pose]'"
 		var/msgout = out.Join()
 		return msgout
 	out += "[FOURSPACES] <span class='[role_span]'>[role]</span> - <span class='[where_span]'>[where]</span>"