diff --git a/src/Application/Controller/Admin/d3webauthnadminlogin.php b/src/Application/Controller/Admin/d3webauthnadminlogin.php
index a909fb3..9fc6ac4 100755
--- a/src/Application/Controller/Admin/d3webauthnadminlogin.php
+++ b/src/Application/Controller/Admin/d3webauthnadminlogin.php
@@ -125,10 +125,9 @@ class d3webauthnadminlogin extends AdminController
             Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId'   => $userId]);
             Registry::getLogger()->debug($e->getTraceAsString());
             $user->logout();
-            $this->getUtils()->redirect('index.php?cl=login');
         }
 
-        return null;
+        return 'login';
     }
 
     /**
diff --git a/src/Application/Controller/d3webauthnlogin.php b/src/Application/Controller/d3webauthnlogin.php
index 1442a86..050d8a7 100755
--- a/src/Application/Controller/d3webauthnlogin.php
+++ b/src/Application/Controller/d3webauthnlogin.php
@@ -85,6 +85,7 @@ class d3webauthnlogin extends FrontendController
             $webauthn = oxNew(Webauthn::class);
             $publicKeyCredentialRequestOptions = $webauthn->getRequestOptions($userId);
             $this->addTplParam('webauthn_publickey_login', $publicKeyCredentialRequestOptions);
+            $this->addTplParam('isAdmin', isAdmin());
         } catch (WebauthnException $e) {
             Registry::getSession()->setVariable(WebauthnConf::GLOBAL_SWITCH, true);
             Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId' => $userId]);
@@ -92,8 +93,6 @@ class d3webauthnlogin extends FrontendController
             Registry::getUtilsView()->addErrorToDisplay($e);
             $this->getUtils()->redirect('index.php?cl=start');
         }
-
-        $this->addTplParam('isAdmin', isAdmin());
     }
 
     /**