diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm
index 165f1a69ab..7d6038cd43 100644
--- a/code/controllers/configuration/entries/config.dm
+++ b/code/controllers/configuration/entries/config.dm
@@ -208,9 +208,9 @@ CONFIG_DEF(string/panic_server_name)
 /datum/config_entry/string/panic_server_name/ValidateAndSet(str_val)
 	return str_val != "\[Put the name here\]" && ..()
 
-CONFIG_DEF(string/panic_address)	//Reconnect a player this linked server if this server isn't accepting new players
+CONFIG_DEF(string/panic_server_address)	//Reconnect a player this linked server if this server isn't accepting new players
 
-/datum/config_entry/string/panic_address/ValidateAndSet(str_val)
+/datum/config_entry/string/panic_server_address/ValidateAndSet(str_val)
 	return str_val != "byond://address:port" && ..()
 
 CONFIG_DEF(string/invoke_youtubedl)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 7b9e2ee4e7..43ae694b84 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -442,7 +442,7 @@ GLOBAL_LIST(external_rsc_urls)
 			message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect during panic bunker</span>")
 			to_chat(src, "Sorry but the server is currently not accepting connections from never before seen players.")
 			var/list/connectiontopic_a = params2list(connectiontopic)
-			var/list/panic_addr = CONFIG_GET(string/panic_address)
+			var/list/panic_addr = CONFIG_GET(string/panic_server_address)
 			if(panic_addr && !connectiontopic_a["redirect"])
 				var/panic_name = CONFIG_GET(string/panic_server_name)
 				to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")