diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 73fd6150f66..454a8b03f4c 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -129,7 +129,7 @@
 
 		if(!M.client && M.mind)
 			message_admins("No client found, searching for compatible mind")
-			for(var/mob/C in player_list)
+			for(var/mob/C in respawnable_list)
 				if(C.mind && C.mind.key == M.mind.key)
 					message_admins("Found mind, asking for respawn")
 					switch(alert(C,"Your corpse has been placed into a cloning scanner. Do you want to be resurrected/cloned? Please not if you select 'No', you will be able to be cloned or borged again this round.","Clone Alert","Yes","No"))
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 9225dad2a4a..095b0539b37 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -85,7 +85,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
-	var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost, you won't be able to respawn as anything this round! You can't change your mind so choose wisely!)","Are you sure you want to ghost?","Ghost","Stay in body")
+	var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost, YOU WILL NOT BE ABLE TO RESPAWN THIS ROUND! You can't change your mind so choose wisely!)","Are you sure you want to ghost?","Ghost","Stay in body")
 	if(response != "Ghost")	return	//didn't want to ghost after-all
 	var/mob/dead/observer/ghost = ghostize(0)            //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
 	if(stat == DEAD)