diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1fae8de111..d8d7185932 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -372,6 +372,12 @@ public class FragmentIdentity extends FragmentBase {
                 etPort.setText(position == 0 ? null : Integer.toString(provider.smtp.port));
                 rgEncryption.check(provider.smtp.starttls ? R.id.radio_starttls : R.id.radio_ssl);
                 cbUseIp.setChecked(provider.useip);
+
+                EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
+                etUser.setEnabled(auth == MailService.AUTH_TYPE_PASSWORD ||
+                        account == null || !provider.imap.host.equals(account.host));
+                tilPassword.setEnabled(auth == MailService.AUTH_TYPE_PASSWORD ||
+                        account == null || !provider.imap.host.equals(account.host));
             }
 
             @Override