diff --git a/code/modules/DMAPI/yawnDMAPI.dm b/code/modules/DMAPI/yawnDMAPI.dm
index 2fc194979d..a86e561558 100644
--- a/code/modules/DMAPI/yawnDMAPI.dm
+++ b/code/modules/DMAPI/yawnDMAPI.dm
@@ -5,7 +5,7 @@
 	admin_only = FALSE	//set to TRUE if this command should only be usable by registered chat admins
 
 /datum/server_tools_command/who/Run(sender, params)
-	SERVER_TOOLS_CHAT_BROADCAST("[SERVER_TOOLS_CLIENT_COUNT]")
+	return "PLAYERCOUNT: [SERVER_TOOLS_CLIENT_COUNT]"
 
 // - FAX
 /datum/server_tools_command/readfax
@@ -19,4 +19,4 @@
 	var/savefile/F = new()
 	var/faxfile = file("[config.fax_export_dir]/fax_[faxid].html")
 	var/faxmsg = F.ImportText("/",faxfile)
-	SERVER_TOOLS_RELAY_BROADCAST("FAX: [url_encode(faxmsg)]")
\ No newline at end of file
+	return "FAX: [url_encode(faxmsg)]"
\ No newline at end of file
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 9eb878c81f..8854351eb8 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -125,7 +125,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 			world.Export("[config.chat_webhook_url]?[query_string]")
 	// VoreStation Edit End
 	//YW EDIT START
-	SERVER_TOOLS_RELAY_BROADCAST("ADMINHELP: FROM: [key_name(src)] - MSG: html_decode(original_msg) - Heard by [admins.len-admin_number_afk] non-AFK staffmembers.")
+	SERVER_TOOLS_RELAY_BROADCAST("ADMINHELP: FROM: [key_name(src)] - MSG: [html_decode(original_msg)] - Heard by [admins.len-admin_number_afk] NON-AFK staff members.")
 	//YW EDIT END
 	return