diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 4b374201a..c9c58a521 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -966,10 +966,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 		this.binding.accountJid.setEnabled(editable);
 		this.binding.accountJid.setFocusable(editable);
 		this.binding.accountJid.setFocusableInTouchMode(editable);
-		if (editable) {
-			this.mPassword.setCustomSelectionActionModeCallback(null);
+
+
+		if (mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) || !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY)) {
+			this.binding.accountPasswordLayout.setPasswordVisibilityToggleEnabled(true);
 		} else {
-			this.mPassword.setCustomSelectionActionModeCallback(new DisabledActionModeCallback());
+			this.binding.accountPasswordLayout.setPasswordVisibilityToggleEnabled(false);
 		}
 
 		if (!mInitMode) {