Index: js/lib/irc.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/js/lib/irc.js,v
retrieving revision 1.120
retrieving revision 1.121
diff -d -p -u -6 -r1.120 -r1.121
--- js/lib/irc.js	15 Feb 2008 22:01:58 -0000	1.120
+++ js/lib/irc.js	18 Apr 2008 02:55:49 -0000	1.121
@@ -760,14 +760,14 @@ function serv_flush()
     return true;
 }
 
 CIRCServer.prototype.login =
 function serv_login(nick, name, desc)
 {
-    nick = nick.replace(" ", "_");
-    name = name.replace(" ", "_");
+    nick = nick.replace(/ /g, "_");
+    name = name.replace(/ /g, "_");
 
     if (!nick)
         nick = "nick";
 
     if (!name)
         name = nick;
Index: xul/content/commands.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/commands.js,v
retrieving revision 1.150
retrieving revision 1.151
diff -d -p -u -6 -r1.150 -r1.151
--- xul/content/commands.js	2 Apr 2008 20:54:20 -0000	1.150
+++ xul/content/commands.js	18 Apr 2008 02:55:50 -0000	1.151
@@ -2186,12 +2186,13 @@ function cmdNick(e)
         else
             curNick = client.prefs["nickname"];
 
         e.nickname = prompt(MSG_NICK_PROMPT, curNick);
         if (e.nickname == null)
             return;
+        e.nickname = e.nickname.replace(/ /g, "_");
     }
 
     if (e.server)
         e.server.changeNick(e.nickname);
 
     if (e.network)
Index: xul/content/prefs.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/prefs.js,v
retrieving revision 1.52
retrieving revision 1.53
diff -d -p -u -6 -r1.52 -r1.53
--- xul/content/prefs.js	2 Apr 2008 20:54:20 -0000	1.52
+++ xul/content/prefs.js	18 Apr 2008 02:55:50 -0000	1.53
@@ -113,13 +113,13 @@ function initPrefs()
 
         for (var i = 0; i < vars.length; i++)
         {
             var nick = en.get(vars[i]);
             if (nick)
             {
-                defaultNick = nick;
+                defaultNick = nick.replace(/ /g, "_");
                 break;
             }
         }
     }
 
     // Set a property so network ident prefs get the same group later: