3 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 17bbbd70..a691f4ec 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -147,7 +147,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "cancel")
     {
-        state = STATE_EXIT;
+        state = STATE_SWITCH_ACCOUNTSERVER_ATTEMPT;
     }
     else if (event.getId() == "new")
     {
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index e7923b9a..a9fa2a56 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -29,6 +29,7 @@
 #include "progressbar.h"
 
 #include "../main.h"
+#include "../log.h"
 
 #include "../utils/gettext.h"
 
@@ -55,6 +56,7 @@ ConnectionDialog::ConnectionDialog(int previousState):
 
 void ConnectionDialog::action(gcn::ActionEvent const &)
 {
+    logger->log("Cancel pressed");
     state = mPreviousState;
 }
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 565277a0..57ad00c5 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -104,7 +104,7 @@ LoginDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "cancel")
     {
-        state = STATE_FORCE_QUIT;
+        state = STATE_SWITCH_ACCOUNTSERVER;
     }
     else if (event.getId() == "register")
     {