diff --git a/src/Extension/MemberExtension.php b/src/Extension/MemberExtension.php
index 9f4a242..ce523db 100644
--- a/src/Extension/MemberExtension.php
+++ b/src/Extension/MemberExtension.php
@@ -174,11 +174,11 @@ public function providePermissions(): array
      */
     protected function onAfterMemberLoggedIn(): void
     {
-        if (!Controller::has_curr()) {
+        $controller = Controller::curr();
+        if (!$controller) {
             return;
         }
-
-        Controller::curr()
+        $controller
             ->getRequest()
             ->getSession()
             ->clear(ChangePasswordHandler::MFA_VERIFIED_ON_CHANGE_PASSWORD);