diff --git a/mods/ctf/ctf_chat/init.lua b/mods/ctf/ctf_chat/init.lua
index 1c1dfd5..65ac52d 100644
--- a/mods/ctf/ctf_chat/init.lua
+++ b/mods/ctf/ctf_chat/init.lua
@@ -303,16 +303,8 @@ if minetest.global_exists("irc") then
 	end
 end
 
-local handler
-handler = function(name, message)
+minetest.register_on_chat_message(function(name, message)
 	if ctf.player(name).team then
-		for i = 1, #minetest.registered_on_chat_messages do
-			local func = minetest.registered_on_chat_messages[i]
-			if func ~= handler and func(name, message) then
-				return true
-			end
-		end
-
 		if not minetest.check_player_privs(name, {shout = true}) then
 			minetest.chat_send_player(name, "-!- You don't have permission to shout.")
 			return true
@@ -324,8 +316,7 @@ handler = function(name, message)
 	else
 		return nil
 	end
-end
-table.insert(minetest.registered_on_chat_messages, 1, handler)
+end)
 
 minetest.registered_chatcommands["me"].func = function(name, param)
 	me_func(name, param)
diff --git a/mods/other/random_messages/init.lua b/mods/other/random_messages/init.lua
index 78935f3..88d5238 100644
--- a/mods/other/random_messages/init.lua
+++ b/mods/other/random_messages/init.lua
@@ -87,7 +87,10 @@ end
 function random_messages.display_message(message_number)
 	local msg = random_messages.messages[message_number] or message_number
 	if msg then
-		minetest.chat_send_all(minetest.colorize("#808080", msg))
+		for i, player in ipairs(minetest.get_connected_players()) do
+			local name = player:get_player_name()
+			minetest.chat_send_player(name, minetest.colorize("#808080", msg))
+		end
 	end
 end