--- a/QTfrontend/net/newnetclient.cpp	Mon Dec 10 10:32:51 2012 -0500
+++ b/QTfrontend/net/newnetclient.cpp	Mon Dec 10 22:09:54 2012 +0100
@@ -538,7 +538,7 @@
 
     if (lst[0] == "ASKPASSWORD")
     {
-        emit AskForPassword(mynick);
+        emit NickRegistered(mynick);
         return;
     }
 
@@ -573,6 +573,10 @@
         if (lst[1] == "Authentication failed")
         {
             emit AuthFailed();
+	    m_game_connected = false;
+	    Disconnect();
+	    //omitted 'emit disconnected()', we don't want the error message
+	    return;
         }
         m_game_connected = false;
         Disconnect();