diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index d4ef40901..750a1da3d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -86,8 +86,10 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 	protected void onStart() {
 		super.onStart();
 		Intent intent = getIntent();
-		String password = intent != null ? intent.getStringExtra("password") : "";
-		this.mNewPassword.getEditableText().append(password);
+		String password = intent != null ? intent.getStringExtra("password") : null;
+		if (password != null) {
+			this.mNewPassword.getEditableText().append(password);
+		}
 	}
 
 	@Override