diff --git a/FAQ.md b/FAQ.md
index 742e5297af..b08e3b54c6 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2144,8 +2144,6 @@ Similarly, the primary identity of an account is used when the identity is ambig
 
 There can be just one primary account and there can be just one primary identity per account.
 
-Note that ordering accounts via the navigation menu of the setup screen takes precedence over primary and secondary accounts.
-
 <br />
 
 <a name="faq73"></a>
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index b17a58f698..1712381164 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -426,6 +426,9 @@ public class ApplicationEx extends Application
         } else if (version < 1533) {
             if (!prefs.contains("biometrics_notify"))
                 editor.putBoolean("biometrics_notify", false);
+        } else if (version < 1535) {
+            editor.remove("identities_asked");
+            editor.remove("identities_primary_hint");
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index 46e58b5e52..2e92ec3201 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -53,7 +53,7 @@ public interface DaoIdentity {
             " WHERE (:account IS NULL OR account.id = :account)" +
             " AND identity.synchronize" +
             " AND account.synchronize" +
-            " ORDER BY account.`order`, account.`primary` DESC, account.name COLLATE NOCASE" +
+            " ORDER BY account.`primary` DESC, account.`order`, account.name COLLATE NOCASE" +
             ", identity.`primary` DESC, identity.display COLLATE NOCASE, identity.name COLLATE NOCASE, identity.email COLLATE NOCASE")
     List<TupleIdentityEx> getComposableIdentities(Long account);