diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index cf4a579744..897154aa7d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -842,11 +842,12 @@ public class FragmentAccount extends FragmentBase {
                 String accountRealm = (account == null ? null : account.realm);
 
                 boolean check = (synchronize && (account == null ||
-                        !account.synchronize || account.error != null ||
+                        !account.synchronize ||
+                        account.insecure != insecure ||
                         !host.equals(account.host) || Integer.parseInt(port) != account.port ||
                         !user.equals(account.user) || !password.equals(account.password) ||
                         !Objects.equals(realm, accountRealm) ||
-                        !TextUtils.isEmpty(account.error)));
+                        account.error != null));
                 boolean reload = (check || account == null ||
                         account.synchronize != synchronize ||
                         account.notify != notify ||
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 8683c949b2..184d7efbda 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -668,12 +668,13 @@ public class FragmentIdentity extends FragmentBase {
                 String identityRealm = (identity == null ? null : identity.realm);
 
                 boolean check = (synchronize && (identity == null ||
-                        !identity.synchronize || identity.error != null ||
+                        !identity.synchronize ||
+                        identity.insecure != insecure ||
                         !host.equals(identity.host) || Integer.parseInt(port) != identity.port ||
                         !user.equals(identity.user) || !password.equals(identity.password) ||
                         !Objects.equals(realm, identityRealm) ||
                         use_ip != identity.use_ip) ||
-                        !TextUtils.isEmpty(identity.error));
+                        identity.error != null);
 
                 Long last_connected = null;
                 if (identity != null && synchronize == identity.synchronize)