diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index ad0090b2ff..fadea97575 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -990,10 +990,8 @@ public class FragmentAccount extends FragmentBase {
                     account.insecure = insecure;
                     account.port = Integer.parseInt(port);
                     account.auth_type = auth;
-                    if (auth == MailService.AUTH_TYPE_PASSWORD) {
-                        account.user = user;
-                        account.password = password;
-                    }
+                    account.user = user;
+                    account.password = password;
                     account.provider = provider;
                     account.realm = realm;
                     account.fingerprint = fingerprint;
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 9b1d911bdd..0ba9fcc03e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -775,10 +775,8 @@ public class FragmentIdentity extends FragmentBase {
                     identity.insecure = insecure;
                     identity.port = Integer.parseInt(port);
                     identity.auth_type = auth;
-                    if (auth == MailService.AUTH_TYPE_PASSWORD) {
-                        identity.user = user;
-                        identity.password = password;
-                    }
+                    identity.user = user;
+                    identity.password = password;
                     identity.provider = provider;
                     identity.realm = realm;
                     identity.fingerprint = fingerprint;