diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 28eeb6ddc5..fc289f39f7 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1454,6 +1454,7 @@ var/global/BSACooldown = 0
 			log_admin("[key_name(usr)] has removed [C]'s adminship")
 			message_admins("[key_name_admin(usr)] has removed [C]'s adminship", 1)
 			admins.Remove(C.ckey)
+			admin_list -= C.mob
 		else
 			if(C == owner)	//no promoting/demoting yourself
 				message_admins("[C] tried to change their own admin-rank >:(")
@@ -1463,6 +1464,7 @@ var/global/BSACooldown = 0
 			log_admin("[key_name(usr)] has made [C] a [rank]")
 			message_admins("[key_name_admin(usr)] has made [C] a [rank]", 1)
 			admins[C.ckey] = rank
+			admin_list |= C.mob
 
 
 	if (href_list["object_list"])
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index a9e19bede7..1db1d9498e 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -751,6 +751,7 @@
 			src.clear_admin_verbs()
 			src.update_admins(null)
 			admins.Remove(src.ckey)
+			admin_list -= src.mob
 			usr << "You are now a normal player."
 	feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 80b4ed69be..60855f13e8 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -48,8 +48,8 @@
 		log_emote("[name]/[key] : [message]")
 
 		for(var/mob/M in dead_mob_list)
-			if (!M.client)
-				continue //skip monkeys and leavers
+			if (!M.client || istype(M, /mob/new_player))
+				continue //skip monkeys, leavers, and new_players
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)
 
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 14ed799ac6..32f797a978 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -475,8 +475,8 @@
  // Maybe some people are okay with that.
 
 		for(var/mob/M in dead_mob_list)
-			if (!M.client)
-				continue //skip monkeys and leavers
+			if (!M.client || istype(M, /mob/new_player))
+				continue //skip monkeys, leavers and new players
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)