diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index 750a1da3d..3fb756308 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -88,6 +88,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 		Intent intent = getIntent();
 		String password = intent != null ? intent.getStringExtra("password") : null;
 		if (password != null) {
+			this.mNewPassword.getEditableText().clear();
 			this.mNewPassword.getEditableText().append(password);
 		}
 	}