diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index e7d8afd1f130..45046e307079 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -26,7 +26,7 @@
 	var/require_comms_key = FALSE
 
 /datum/world_topic/proc/TryRun(list/input, addr)
-	key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
+	key_valid = (CONFIG_GET(string/comms_key) == input["key"]) && CONFIG_GET(string/comms_key) && input["key"]
 	if(require_comms_key && !key_valid)
 		return "Bad Key"
 	input -= "key"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e3fead27028e..a4696489de44 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1006,7 +1006,7 @@
 	log_admin("[key_name(usr)] stuffed [frommob.key] into [tomob.name].")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag Control")
 
-	tomob.ckey = frommob.ckey
+	tomob.key = frommob.key
 	qdel(frommob)
 
 	return TRUE
diff --git a/code/modules/mob/dead/observer/respawn.dm b/code/modules/mob/dead/observer/respawn.dm
index 5d1f65311df7..2390e6fd1e2a 100644
--- a/code/modules/mob/dead/observer/respawn.dm
+++ b/code/modules/mob/dead/observer/respawn.dm
@@ -180,5 +180,5 @@
 	client.view_size.resetToDefault()
 
 	var/mob/dead/new_player/M = new /mob/dead/new_player
-	M.ckey = ckey
+	M.key = key
 	return M
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 736066a06159..998d0ee923e5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -483,7 +483,7 @@
 				client.prefs.chat_toggles ^= CHAT_OOC
 			if (!(client.prefs.chat_toggles & CHAT_OOC) && isdead(new_mob))
 				client.prefs.chat_toggles ^= CHAT_OOC
-	new_mob.ckey = ckey
+	new_mob.key = key
 	if(send_signal)
 		SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
 	return TRUE