diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index ac37e449db..6b3f77b61c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -148,7 +148,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         super.onPause();
 
         if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
-            finish();
+            finishAndRemoveTask();
     }
 
     @Override
@@ -162,7 +162,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         Log.i("User interaction");
 
         if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
-            finish();
+            finishAndRemoveTask();
             startActivity(new Intent(this, ActivityMain.class));
         }
     }
@@ -207,7 +207,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     private void checkAuthentication() {
         if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
             Intent intent = getIntent();
-            finish();
+            finishAndRemoveTask();
             startActivity(
                     new Intent(this, ActivityMain.class)
                             .putExtra("intent", intent));