diff --git a/src/main/java/envoy/client/ui/controller/LoginScene.java b/src/main/java/envoy/client/ui/controller/LoginScene.java
index 2435980..a72ef78 100644
--- a/src/main/java/envoy/client/ui/controller/LoginScene.java
+++ b/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -114,8 +114,10 @@ public final class LoginScene {
 	private void loginButtonPressed() {
 
 		// Prevent registration with unequal passwords
-		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText()))
+		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
 			new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
+			repeatPasswordField.clear();
+		}
 		else performHandshake(
 				new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected(), Startup.VERSION));
 	}