diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index cf69dda1e2..0b5b652cf5 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -188,7 +188,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -196,7 +195,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index a3262583ed..568aa2c751 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -192,7 +192,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -200,7 +199,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 2f1ae39c54..abeb6c632f 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -192,7 +192,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -200,7 +199,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6bb60fcad1..60bbb61943 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -187,7 +187,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -195,7 +194,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"
diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 3bd4364621..d82b4193ab 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -470,9 +470,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
     public void onBackStackChanged() {
         int count = getSupportFragmentManager().getBackStackEntryCount();
         if (count == 0) {
-            if (hasAccount)
+            if (hasAccount) {
                 startActivity(new Intent(this, ActivityView.class));
-            finish();
+                finishAndRemoveTask();
+            } else
+                finish();
         } else {
             if (drawerLayout.isDrawerOpen(drawerContainer))
                 drawerLayout.closeDrawer(drawerContainer);
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index da0611ca0a..d4bed40902 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -188,7 +188,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -196,7 +195,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"