diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 63588c6889..38266edc28 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -268,9 +268,20 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
         if (getSupportFragmentManager().getFragments().size() == 0) {
+            Intent intent = getIntent();
+            String target = intent.getStringExtra("target");
+
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-            fragmentTransaction.replace(R.id.content_frame, new FragmentSetup()).addToBackStack("setup");
+            if ("accounts".equals(target))
+                fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts");
+            else
+                fragmentTransaction.replace(R.id.content_frame, new FragmentSetup()).addToBackStack("setup");
             fragmentTransaction.commit();
+
+            if (intent.hasExtra("target")) {
+                intent.removeExtra("target");
+                setIntent(intent);
+            }
         }
 
         if (savedInstanceState != null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index fb328f0558..d93f44c949 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -170,9 +170,9 @@ public class FragmentFolders extends FragmentBase {
         fabError.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts");
-                fragmentTransaction.commit();
+                Intent intent = new Intent(getContext(), ActivitySetup.class)
+                        .putExtra("target", "accounts");
+                startActivity(intent);
             }
         });