diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 71581811e88..24e868aaf73 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -20,6 +20,5 @@
 	if (key)
 		spawn(50)
 			if(key && stat == 2)
-				src << "You are now dead. If you cannot ghost at this point, relog into the game."
-				verbs += /mob/proc/ghost
+				ghost()
 	return ..(gibbed)
\ No newline at end of file
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 00ab2bcbba5..d67d5839612 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -56,6 +56,9 @@ datum/preferences
 		be_special = 0
 		//Play admin midis
 		midis = 1
+		//Toggle ghost ears
+		ghost_ears = 1
+		ghost_sight = 1
 		//Play pregame music
 		pregame_music = 1
 		//Saved changlog filesize to detect if there was a change
@@ -235,6 +238,7 @@ datum/preferences
 		dat += "<br>"
 		dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[UI == UI_NEW ? "New" : "Old"]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[midis == 1 ? "Yes" : "No"]</b></a><br>"
+		dat += "<b>Ghost ears:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_ears=input\"><b>[ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]</b></a><br>"
 
 		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.rank == "Game Master"))
 			dat += "<hr><b>OOC</b><br>"
@@ -746,6 +750,8 @@ datum/preferences
 
 		if(link_tags["midis"])
 			midis = (midis+1)%2
+		if(link_tags["ghost_ears"])
+			ghost_ears = !ghost_ears
 
 		if(link_tags["underwear"])
 			if(!IsGuestKey(user.key))
@@ -857,6 +863,7 @@ datum/preferences
 			b_type = "A+"
 			UI = UI_OLD
 			midis = 1
+			ghost_ears = 1
 			disabilities = 0
 		if(link_tags["disabilities"])
 			if(text2num(link_tags["disabilities"]) >= -1)
diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm
index f5656d8fba2..cffc522970d 100644
--- a/code/modules/mob/new_player/savefile.dm
+++ b/code/modules/mob/new_player/savefile.dm
@@ -136,6 +136,7 @@ datum/preferences/proc/savefile_save(mob/user, slot)
 	F["be_special"] << src.be_special
 	F["UI"] << src.UI
 	F["midis"] << src.midis
+	F["ghost_ears"] << src.ghost_ears
 	F["pregame_music"] << src.pregame_music
 	F["ooccolor"] << src.ooccolor
 	F["lastchangelog"] << src.lastchangelog
@@ -201,6 +202,8 @@ datum/preferences/proc/savefile_load(mob/user, slot)
 	F["underwear"] >> src.underwear
 	F["name_is_always_random"] >> src.be_random_name
 	F["midis"] >> src.midis
+	F["ghost_ears"] >> src.ghost_ears
+	if(isnull(ghost_ears)) ghost_ears = 1 //Hotfix
 	F["pregame_music"] >> src.pregame_music
 	F["ooccolor"] >> src.ooccolor
 	F["lastchangelog"] >> src.lastchangelog