diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 5e4833247f..3e6f9b2605 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -284,8 +284,8 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             tvWarning.setVisibility(account.warning == null || !settings ? View.GONE : View.VISIBLE);
 
             tvError.setText(account.error);
-            tvError.setVisibility(account.error == null ? View.GONE : View.VISIBLE);
-            btnHelp.setVisibility(account.error == null ? View.GONE : View.VISIBLE);
+            tvError.setVisibility(account.error == null || !settings ? View.GONE : View.VISIBLE);
+            btnHelp.setVisibility(account.error == null || !settings ? View.GONE : View.VISIBLE);
 
             ibInbox.setVisibility(settings ? View.GONE : View.VISIBLE);
             grpSettings.setVisibility(settings ? View.VISIBLE : View.GONE);