diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 02f20714e9..86844a2ea9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -270,6 +270,10 @@ public class FragmentIdentity extends FragmentBase {
                         spProvider.setTag(0);
                         spProvider.setSelection(0);
                         setProvider((EmailProvider) spProvider.getItemAtPosition(0));
+                        if (account.host == null || account.host.startsWith("imap"))
+                            etHost.setText(null);
+                        else
+                            etHost.setText(account.host);
                         grpAdvanced.setVisibility(View.VISIBLE);
                     }