diff --git a/data/web/mobileconfig.php b/data/web/mobileconfig.php
index 02e0e9a56..af387b7c6 100644
--- a/data/web/mobileconfig.php
+++ b/data/web/mobileconfig.php
@@ -12,6 +12,10 @@ if (!isset($_SESSION['mailcow_cc_role']) || $_SESSION['mailcow_cc_role'] != 'use
   header('Location: index.php?mobileconfig' . $append_get);
   die();
 }
+if (!empty($_SESSION['pending_tfa_setup']) || !empty($_SESSION['pending_pw_update'])) {
+  header('Location: /');
+  die();
+}
 
 error_reporting(0);