diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
index 16e54703cf4..6ea7cc1d8ed 100644
--- a/code/_globalvars/game_modes.dm
+++ b/code/_globalvars/game_modes.dm
@@ -4,4 +4,5 @@ var/secret_force_mode = "secret" // if this is anything but "secret", the secret
 var/wavesecret = 0 // meteor mode, delays wave progression, terrible name
 var/datum/station_state/start_state = null // Used in round-end report
 
-var/custom_event_msg = null
\ No newline at end of file
+var/custom_event_msg = null
+var/custom_event_admin_msg = null
\ No newline at end of file
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 399248d2f7a..e89d333771e 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -109,6 +109,7 @@ var/list/admin_verbs_event = list(
 	/client/proc/toggle_ert_calling,
 	/client/proc/cmd_admin_change_custom_event,
 	/client/proc/cmd_admin_custom_event_info,
+	/client/proc/cmd_view_custom_event_info,
 	/datum/admins/proc/access_news_network,	/*allows access of newscasters*/
 	/client/proc/cmd_admin_direct_narrate,	/*send text directly to a player with no padding. Useful for narratives and fluff-text*/
 	/client/proc/cmd_admin_world_narrate,	/*sends text to all players with no padding*/
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index 40f5bf8eefb..e72423b9405 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -51,7 +51,7 @@
 
 	var/input = input(usr, "Enter the description of the custom event. This is informations for admins only. Use it to notify other admins of event info but not players.", "Custom Event Info", custom_event_msg) as message|null
 	if(!input || input == "")
-		custom_event_msg = null
+		custom_event_admin_msg = null
 		log_admin("[key_name(usr)] has cleared the custom admin event info text.")
 		message_admins("[key_name_admin(usr)] has cleared the custom admin event text.")
 		return
@@ -59,25 +59,28 @@
 	log_admin("[key_name(usr)] has changed the custom admin event info text.")
 	message_admins("[key_name_admin(usr)] has changed the custom admin event info text.")
 
-	custom_event_msg = input
+	custom_event_admin_msg = input
 
 	for(var/client/X in admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, "<h1 class='alert'>Custom Admin Event Info</h1>")
 			to_chat(X, "<h2 class='alert'>A custom event is starting. OOC Admin Info:</h2>")
-			to_chat(X, "<span class='alert'>[html_encode(custom_event_msg)]</span>")
+			to_chat(X, "<span class='alert'>[html_encode(custom_event_admin_msg)]</span>")
 			to_chat(X,"<br>")
 
-/client/verb/cmd_view_custom_event_info()
+/client/proc/cmd_view_custom_event_info()
 	set category = "Event"
 	set name = "Custom Event Admin Info"
 
-	if(!custom_event_msg || custom_event_msg == "")
+	if(!holder)
+		to_chat(src, "Only administrators may use this command.")
+		return
+
+	if(!custom_event_admin_msg || custom_event_admin_msg == "")
 		to_chat(src, "There currently is no known custom admin event taking place.")
-		to_chat(src, "Keep in mind: it is possible that an admin has not properly set this.")
 		return
 
 	to_chat(src, "<h1 class='alert'>Custom Event Info</h1>")
 	to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
-	to_chat(src, "<span class='alert'>[html_encode(custom_event_msg)]</span>")
+	to_chat(src, "<span class='alert'>[html_encode(custom_event_admin_msg)]</span>")
 	to_chat(src, "<br>")
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 00402f2deb6..fd6dd8ad215 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -436,6 +436,8 @@
 		on_holder_add()
 		add_admin_verbs()
 		admin_memo_output("Show", 0, 1)
+		if(custom_event_admin_msg && custom_event_admin_msg != "")
+			cmd_view_custom_event_info()
 
 	// Forcibly enable hardware-accelerated graphics, as we need them for the lighting overlays.
 	// (but turn them off first, since sometimes BYOND doesn't turn them on properly otherwise)