diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index c44029174a..036da5aca4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -190,6 +190,8 @@ public class FragmentOptions extends FragmentBase {
         super.onCreate(savedInstanceState);
         Context context = getContext();
         this.dp24 = (context == null ? -48 : Helper.dp2pixels(context, 24));
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        prefs.edit().remove("setup_advanced").apply();
     }
 
     @Override
diff --git a/app/src/main/res/layout/dialog_advanced.xml b/app/src/main/res/layout/dialog_advanced.xml
index 8efc39166c..275211d95c 100644
--- a/app/src/main/res/layout/dialog_advanced.xml
+++ b/app/src/main/res/layout/dialog_advanced.xml
@@ -38,6 +38,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
+        <TextView
+            android:id="@+id/tvConfigure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_hint_configure"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+
+
         <TextView
             android:id="@+id/tvRemark"
             android:layout_width="wrap_content"
@@ -47,7 +60,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+            app:layout_constraintTop_toBottomOf="@id/tvConfigure" />
 
         <TextView
             android:id="@+id/tvOptions"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6f79d68ac..e79fe90022 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -417,6 +417,10 @@
         You are navigating to the more advanced options.
         All options have commonly used standard values, which you do not need to change unless you have a different preference.
     </string>
+    <string name="title_advanced_hint_configure">
+        You don\'t need to be here to configure an account. Please use the quick setup wizard button for this.
+        The quick setup wizard almost always works, but if it doesn\'t, you can use the classic manual setup a little below the wizard button.
+    </string>
     <string name="title_advanced_hint_remark">
         The options are categorized by tab, divided into sections, organized by appearance or use, and searchable.
     </string>
@@ -2749,7 +2753,7 @@
     </string-array>
 
     <string-array name="onCloseValues" translatable="false">
-        <item></item>
+        <item>none</item>
         <item>previous</item>
         <item>next</item>
     </string-array>