diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index 944ec5dfa101afd9e308e224b9d006e615ee55b0..263bc64205f1a7fa5255732d6a3c5a8715970f12 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -28,7 +28,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 			}
 			final String currentPassword = binding.currentPassword.getText().toString();
 			final String newPassword = binding.newPassword.getText().toString();
-			if ((!account.isOptionSet(Account.OPTION_MAGIC_CREATE) || didUnlock) && !currentPassword.equals(account.getPassword())) {
+			if (!account.isOptionSet(Account.OPTION_MAGIC_CREATE) && !didUnlock && !currentPassword.equals(account.getPassword())) {
 				binding.currentPassword.requestFocus();
 				binding.currentPasswordLayout.setError(getString(R.string.account_status_unauthorized));
 				removeErrorsOnAllBut(binding.currentPasswordLayout);