diff --git a/extensions/irc/xul/content/handlers.js b/extensions/irc/xul/content/handlers.js
index a4aacac6763..97292334b0f 100644
--- a/extensions/irc/xul/content/handlers.js
+++ b/extensions/irc/xul/content/handlers.js
@@ -1413,7 +1413,7 @@ function cli_iserver (e)
         return false;
 
     var ary = 
-        e.inputData.match(/^([^\s\:]+)[\s\:]?(?:(\d+)(?:\s+(\S+)|$)|(\S+)|$)/);
+        e.inputData.match(/^([^\s\:]+)[\s\:]?(?:(\d+)(?:\s+(\S+)|\s*$)|(\S+)|$)/);
     var pass;
     if (3 in ary && ary[3])
         pass = ary[3];