diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 6c96fa0f17..644ea5325c 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -92,11 +92,12 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	//send this msg to all admins
 	var/admin_number_afk = 0
 	for(var/client/X in admins)
-		if(X.is_afk())
-			admin_number_afk++
-		if(X.prefs.toggles & SOUND_ADMINHELP)
-			X << 'sound/effects/adminhelp.ogg'
-		X << msg
+		if((R_ADMIN|R_MOD) & X.holder.rights)
+			if(X.is_afk())
+				admin_number_afk++
+			if(X.prefs.toggles & SOUND_ADMINHELP)
+				X << 'sound/effects/adminhelp.ogg'
+			X << msg
 
 	//show it to the person adminhelping too
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index b1516b44fd..b247a74f38 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -14,11 +14,7 @@
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights)
 				C << msg
-/*		admins << msg
-	else
-		msg = "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]:</EM> <span class='message'>[msg]</span></span>"
-		admins << msg
-*/
+
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_mod_say(msg as text)
@@ -26,29 +22,17 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if (!src.holder)
-		src << "Only administrators may use this command."
-		return
-
-	//todo: what? why does this not compile
-	/*if (src.muted || src.muted_complete)
-		src << "You are muted."
-		return*/
+	if(!check_rights(R_ADMIN|R_MOD))	return
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	log_admin("MOD: [key_name(src)] : [msg]")
 
-
 	if (!msg)
 		return
-	//feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-	for (var/mob/M in world)
-		if (M.client && M.client.holder)
-			if (check_rights(R_ADMIN,0))
-				M << "<span class='adminmod'><span class='prefix'>MOD:</span> <EM>[key_name(usr, M)]</EM> (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
-			else if (check_rights(R_MOD,0))
-				M << "<span class='mod'><span class='prefix'>MOD:</span> <EM>[key_name(usr, M)]</EM> (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
-			else if (src.holder.rank == "Admin Observer")
-				M << "<span class='adminobserver'><span class='prefix'>MOD:</span> <EM>[key_name(usr, M)]:</EM> <span class='message'>[msg]</span></span>"
-
+	var/color = "mod"
+	if (check_rights(R_ADMIN,0))
+		color = "adminmod"
+	msg = "<span class='[color]'><span class='prefix'>MOD:</span> <EM>[key_name(src)]</EM> (<A HREF='?src=\ref[holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
+	for(var/client/C in admins)
+		if((R_ADMIN|R_MOD) & C.holder.rights)
+			C << msg