diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 2ac093c6ba..ad1a700d17 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -398,8 +398,8 @@ public class EntityAccount extends EntityOrder implements Serializable {
             account.provider = json.getString("provider");
         account.user = json.getString("user");
         account.password = json.getString("password");
-        if (json.has("certificate_alias") && !json.isNull("certificate_alias"))
-            account.certificate_alias = json.getString("certificate_alias");
+        //if (json.has("certificate_alias") && !json.isNull("certificate_alias"))
+        //    account.certificate_alias = json.getString("certificate_alias");
         if (json.has("realm") && !json.isNull("realm"))
             account.realm = json.getString("realm");
         if (json.has("fingerprint") && !json.isNull("fingerprint"))
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 9447edf101..04669fd161 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -331,8 +331,8 @@ public class EntityIdentity {
         identity.user = json.getString("user");
         identity.password = json.getString("password");
         identity.login = json.optBoolean("login");
-        if (json.has("certificate_alias") && !json.isNull("certificate_alias"))
-            identity.certificate_alias = json.getString("certificate_alias");
+        //if (json.has("certificate_alias") && !json.isNull("certificate_alias"))
+        //    identity.certificate_alias = json.getString("certificate_alias");
         if (json.has("realm") && !json.isNull("realm"))
             identity.realm = json.getString("realm");
         if (json.has("fingerprint") && !json.isNull("fingerprint"))