diff --git a/modules/watch.cpp b/modules/watch.cpp
index 404ee75e..e975f04a 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -632,7 +632,7 @@ class CWatcherMod : public CModule {
     
         CString sHostMask = sLine.Token(1);
         CString sTarget = sLine.Token(2);
-        CString sPattern = sLine.Token(3);
+        CString sPattern = sLine.Token(3, true);
 
         CString sMessage;
 
diff --git a/test/integration/tests/modules.cpp b/test/integration/tests/modules.cpp
index f283ceb7..1a35c44f 100644
--- a/test/integration/tests/modules.cpp
+++ b/test/integration/tests/modules.cpp
@@ -78,6 +78,11 @@ TEST_F(ZNCTest, WatchModule) {
     ircd.Write(":n!i@h PRIVMSG #znc :\001ACTION foo\001");
     client.ReadUntil(
         ":$*!watch@znc.in PRIVMSG nick :* CTCP: n [ACTION foo] to [#znc]");
+    client.Write("PRIVMSG *watch :add * *spaces *word1 word2*");
+    client.ReadUntil("Adding entry:");
+    ircd.Write(":n!i@h PRIVMSG #znc :SOMETHING word1 word2 SOMETHING");
+    client.ReadUntil(
+        ":*spaces!watch@znc.in PRIVMSG nick :<n:#znc> SOMETHING word1 word2 SOMETHING");
 }
 
 TEST_F(ZNCTest, ModuleCrypt) {