diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index c4f168cdda..ca6f247b50 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -600,8 +600,8 @@ public class FragmentAccount extends FragmentEx {
                 cbPrimary.setEnabled(account == null ? true : account.synchronize);
                 ibDelete.setVisibility(account == null ? View.GONE : View.VISIBLE);
 
-                btnCheck.setVisibility(account.synchronize ? View.VISIBLE : View.GONE);
-                btnSave.setVisibility(account.synchronize ? View.GONE : View.VISIBLE);
+                btnCheck.setVisibility(account == null || account.synchronize ? View.VISIBLE : View.GONE);
+                btnSave.setVisibility(account == null || account.synchronize ? View.GONE : View.VISIBLE);
 
                 btnCheck.setEnabled(true);
                 pbWait.setVisibility(View.GONE);