diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 92e75acdce..47a0933bb3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -750,15 +750,21 @@ public class FragmentAccount extends FragmentEx {
 
                 if (savedInstanceState == null) {
                     if (account != null) {
+                        boolean found = false;
                         for (int pos = 2; pos < providers.size(); pos++) {
                             Provider provider = providers.get(pos);
                             if (provider.imap_host.equals(account.host) &&
                                     provider.imap_port == account.port) {
+                                found = true;
                                 spProvider.setTag(pos);
                                 spProvider.setSelection(pos);
                                 break;
                             }
                         }
+                        if (!found) {
+                            spProvider.setTag(1);
+                            spProvider.setSelection(1);
+                        }
                         etHost.setText(account.host);
                         etPort.setText(Long.toString(account.port));
                     }