diff --git a/ChangeLog b/ChangeLog
index 96f0f6af4..60f959415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,9 @@ Version 0.4.1 (under dev!)
 * relay: add options "buffers" and "upgrade" for commands sync/desync in weechat
   protocol
 * relay: fix commands sync/desync in weechat protocol (bug #38215)
+* rmodifier: rename default rmodifier "nickserv" to "command_auth" (with new
+  modifier "irc_command_auth"), add default rmodifier "message_auth" (modifier
+  "irc_message_auth")
 * scripts: do not allow empty script name in function "register"
 
 Version 0.4.0 (2013-01-20)
diff --git a/src/plugins/rmodifier/rmodifier-config.c b/src/plugins/rmodifier/rmodifier-config.c
index 64ebd871e..ee0334c69 100644
--- a/src/plugins/rmodifier/rmodifier-config.c
+++ b/src/plugins/rmodifier/rmodifier-config.c
@@ -36,8 +36,11 @@ struct t_config_option *rmodifier_config_look_hide_char;
 
 char *rmodifier_config_default_list[][4] =
 {
-    { "nickserv", "history_add,input_text_display",
-      "^(/(msg|quote) +nickserv +(id|identify|ghost \\S+|release \\S+) +)(.*)", "1,4*"
+    { "command_auth", "history_add,input_text_display,irc_command_auth",
+      "^(/(msg|quote) +nickserv +(id|identify|register|ghost \\S+|release \\S+) +)(.*)", "1,4*"
+    },
+    { "message_auth", "irc_message_auth",
+      "^(.*(id|identify|register|ghost \\S+|release \\S+) +)(.*)", "1,3*"
     },
     { "server", "history_add,input_text_display",
       "^(/(server|connect) .*-(sasl_)?password=)(\\S+)(.*)", "1,4*,5"