diff --git a/src/com/coder/client/CoderClient.java b/src/com/coder/client/CoderClient.java
index 8017634..c42768f 100755
--- a/src/com/coder/client/CoderClient.java
+++ b/src/com/coder/client/CoderClient.java
@@ -167,6 +167,7 @@ public class CoderClient extends Application{
 			}
 			@Override
 			public void cancel() {
+				loginDialog.setErrorMessage("");
 				selectServerDialog.setServerAddress(null);
 				selectServerDialog.showOnStage(mainStage);
 			}
@@ -309,6 +310,7 @@ public class CoderClient extends Application{
 			}
 			@Override
 			public void cancel() {
+				loginDialog.setPassword(null);
 				selectServerDialog.setServerAddress(null);
 				selectServerDialog.showOnStage(mainStage);
 			}