diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 18fbecddf7..8502cc7f36 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -253,10 +253,14 @@ public class FragmentIdentity extends FragmentBase {
                 }
 
                 // Copy account credentials
+                auth = (account.auth_type == null ? MailService.AUTH_TYPE_PASSWORD : account.auth_type);
                 etEmail.setText(account.user);
                 etUser.setText(account.user);
                 tilPassword.getEditText().setText(account.password);
                 etRealm.setText(account.realm);
+
+                etUser.setEnabled(auth == MailService.AUTH_TYPE_PASSWORD);
+                tilPassword.setEnabled(auth == MailService.AUTH_TYPE_PASSWORD);
                 cbTrust.setChecked(false);
             }