diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index afe741976..66b74b759 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -82,6 +82,7 @@ Bug fixes::
   * lua: fix crash with print when the value to print is not a string (issue #1904, issue #1905)
   * ruby: fix crash on quit when a child process is still running (issue #1889, issue #1915)
   * spell: check buffer pointer received in info "spell_dict"
+  * trigger: make default triggers "cmd_pass", "cmd_pass_register" and "server_pass" compatible with multiline input (issue #1935)
   * typing: fix crash when pointer buffer is not received in callback for signal "input_text_changed" (issue #1869)
   * typing: remove nicks typing even when option typing.look.enabled_self is off (issue #1718)
 
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index a71bdb172..95f23e7d3 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -194,6 +194,18 @@ If needed, you can reset the option to the new default value after upgrade:
 
 The option `weechat.look.paste_auto_add_newline` has been removed.
 
+[[v4.0.0_default_triggers]]
+=== Default triggers
+
+The default triggers "cmd_pass", "cmd_pass_register" and "server_pass" have
+been updated to be compatible with multiline input.
+
+You can restore these default triggers with the following command:
+
+----
+/trigger restore cmd_pass cmd_pass_register server_pass
+----
+
 [[v4.0.0_build]]
 === Build
 
diff --git a/src/plugins/trigger/trigger-config.c b/src/plugins/trigger/trigger-config.c
index a430ba9d8..700febc26 100644
--- a/src/plugins/trigger/trigger-config.c
+++ b/src/plugins/trigger/trigger-config.c
@@ -99,21 +99,21 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
       "5000|input_text_display;5000|history_add;5000|irc_command_auth",
       "",
       "s==^("
-      "(/(msg|m|quote) +(-server +[^ ]+ +)?nickserv +("
+      "(/(msg|m|quote) +(-server +[^ \\n]+ +)?nickserv +("
       "id|"
       "identify|"
       "set +password|"
-      "ghost +[^ ]+|"
-      "release +[^ ]+|"
-      "regain +[^ ]+|"
-      "recover +[^ ]+|"
-      "setpass +[^ ]+"
+      "ghost +[^ \\n]+|"
+      "release +[^ \\n]+|"
+      "regain +[^ \\n]+|"
+      "recover +[^ \\n]+|"
+      "setpass +[^ \\n]+"
       ") +)|"
-      "/oper +[^ ]+ +|"
+      "/oper +[^ \\n]+ +|"
       "/quote +pass +|"
-      "/secure +(passphrase|decrypt|set +[^ ]+) +"
+      "/secure +(passphrase|decrypt|set +[^ \\n]+) +"
       ")"
-      "(.*)"
+      "([^\\n]*)"
       "==${re:1}${hide:*,${re:+}}",
       "",
       "",
@@ -126,7 +126,8 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
       "modifier",
       "5000|input_text_display;5000|history_add;5000|irc_command_auth",
       "",
-      "s==^(/(msg|m|quote) +(-server +[^ ]+ +)?nickserv +register +)([^ ]+)(.*)"
+      "s==^(/(msg|m|quote) +(-server +[^ \\n]+ +)?nickserv +register +)"
+      "([^ \\n]+)([^\\n]*)"
       "==${re:1}${hide:*,${re:4}}${re:5}",
       "",
       "",
@@ -172,7 +173,7 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
       "modifier",
       "5000|input_text_display;5000|history_add",
       "",
-      "s==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)"
+      "s==^(/(server|connect) [^\\n]*-(sasl_)?password=)([^ \\n]+)([^\\n]*)"
       "==${re:1}${hide:*,${re:4}}${re:5}"
       "",
       "",