diff --git a/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties b/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties
index 1f4bb33d94d..b630c84085d 100644
--- a/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties
+++ b/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties
@@ -985,7 +985,6 @@ msg.all.commands      = Currently implemented commands are [%S].
 msg.help.intro        = Help is available from many places:\n  - |/commands| lists all the built-in commands in ChatZilla. Use |/help <command-name>| to get help on individual commands.\n  - The IRC Help website <http://www.irchelp.org/> provides introductory material for new IRC users. \n  - The ChatZilla website <http://chatzilla.hacksrus.com/> provides more information about IRC and ChatZilla, including the ChatZilla FAQ <http://chatzilla.hacksrus.com/faq>, which answers many common questions about using ChatZilla.
 msg.about.version     = "%S [[Details][Opens the about dialog for more details][%S]]
 msg.about.homepage    = Please visit the ChatZilla homepage at <http://chatzilla.hacksrus.com/> for more information.
-msg.client.opened     = JavaScript console for ``*client*'' opened.
 msg.newnick.you       = YOU are now known as %S
 msg.newnick.notyou    = "%S is now known as %S
 msg.view.hidden       = "%S (hidden)
diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js
index 195abc92faa..860c083663e 100644
--- a/mozilla/extensions/irc/xul/content/commands.js
+++ b/mozilla/extensions/irc/xul/content/commands.js
@@ -3393,16 +3393,15 @@ function cmdKnock(e)
 
 function cmdClient(e)
 {
-    dispatch("create-tab-for-view", { view: client });
-
-    if (!client.messages)
+    if (!("messages" in client))
     {
-        client.display(MSG_CLIENT_OPENED);
-        dispatch("set-current-view", { view: client });
         client.display(MSG_WELCOME, "HELLO");
+        dispatch("set-current-view", { view: client });
+        dispatch("help", { hello: true });
         dispatch("networks");
-        dispatch("commands");
-    } else {
+    }
+    else
+    {
         dispatch("set-current-view", { view: client });
     }
 }