diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 54b5258222..b5ac4d7356 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -189,7 +189,6 @@ public class FragmentQuickSetup extends FragmentBase {
         pbCheck.setVisibility(View.GONE);
         pbSave.setVisibility(View.GONE);
         btnHelp.setVisibility(View.GONE);
-        btnSupport.setVisibility(View.GONE);
         tvInstructions.setVisibility(View.GONE);
         tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
         grpSetup.setVisibility(View.GONE);
@@ -241,7 +240,6 @@ public class FragmentQuickSetup extends FragmentBase {
                 pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
                 grpError.setVisibility(View.GONE);
                 btnHelp.setVisibility(View.GONE);
-                btnSupport.setVisibility(View.GONE);
                 tvInstructions.setVisibility(View.GONE);
                 grpSetup.setVisibility(check ? View.GONE : View.VISIBLE);
             }
@@ -496,7 +494,7 @@ public class FragmentQuickSetup extends FragmentBase {
                     getMainHandler().post(new Runnable() {
                         @Override
                         public void run() {
-                            scroll.smoothScrollTo(0, tvErrorHint.getBottom());
+                            scroll.smoothScrollTo(0, btnSupport.getBottom());
                         }
                     });
                 } else {
@@ -509,8 +507,6 @@ public class FragmentQuickSetup extends FragmentBase {
                         btnHelp.setVisibility(View.VISIBLE);
                     }
 
-                    btnSupport.setVisibility(View.VISIBLE);
-
                     if (args.containsKey("documentation")) {
                         tvInstructions.setText(HtmlHelper.fromHtml(args.getString("documentation"), getContext()));
                         tvInstructions.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index d0e316c35a..fda6f59db6 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -289,6 +289,6 @@
             android:id="@+id/grpError"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark" />
+            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>