diff --git a/auth/lib/core/configuration.dart b/auth/lib/core/configuration.dart
index aed7516b9f..586a519b65 100644
--- a/auth/lib/core/configuration.dart
+++ b/auth/lib/core/configuration.dart
@@ -141,6 +141,7 @@ class Configuration {
         iOptions: _secureStorageOptionsIOS,
       );
     }
+    await LockScreenSettings.instance.removePinAndPassword();
     await AuthenticatorDB.instance.clearTable();
     _key = null;
     _cachedToken = null;
diff --git a/auth/lib/ui/tools/lock_screen.dart b/auth/lib/ui/tools/lock_screen.dart
index c75d906221..fcacea8231 100644
--- a/auth/lib/ui/tools/lock_screen.dart
+++ b/auth/lib/ui/tools/lock_screen.dart
@@ -301,12 +301,6 @@ class _LockScreenState extends State<LockScreen> with WidgetsBindingObserver {
 
   Future<void> _autoLogoutOnMaxInvalidAttempts() async {
     _logger.info("Auto logout on max invalid attempts");
-    await showErrorDialog(
-      context,
-      "Too many incorrect attempts",
-      "Please login again",
-      isDismissable: false,
-    );
     Navigator.of(context, rootNavigator: true).pop('dialog');
     Navigator.of(context).popUntil((route) => route.isFirst);
     final dialog = createProgressDialog(context, "Logging out ...");