diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index a07cb9b81d..9a95f93f01 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -78,7 +78,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
     @NonNull
     public String password;
     @NonNull
-    public Boolean certificate; // obsolete
+    public Boolean certificate = false; // obsolete
     public String certificate_alias;
     public String realm;
     public String fingerprint;
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 1dd7ea59e3..5e9d0c5ea0 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -78,7 +78,7 @@ public class EntityIdentity {
     @NonNull
     public String password;
     @NonNull
-    public boolean certificate; // obsolete
+    public boolean certificate = false; // obsolete
     public String certificate_alias;
     public String realm;
     public String fingerprint;