diff --git a/src/Cms/Auth/Filters/AuthenticationFilter.php b/src/Cms/Auth/Filters/AuthenticationFilter.php
index df21001..e4accc4 100644
--- a/src/Cms/Auth/Filters/AuthenticationFilter.php
+++ b/src/Cms/Auth/Filters/AuthenticationFilter.php
@@ -37,7 +37,8 @@ function( RouteMap $route ) { $this->checkAuthentication( $route ); },
 	 */
 	protected function checkAuthentication( RouteMap $route ): void
 	{
-		if( !$this->_authManager->check() )
+		$user = $this->_authManager->user();
+		if( !$user )
 		{
 			// Store intended URL for post-login redirect
 			$intendedUrl = $_SERVER['REQUEST_URI'] ?? $route->getPath();
@@ -51,14 +52,9 @@ protected function checkAuthentication( RouteMap $route ): void
 			exit;
 		}
 
-		// Store authenticated user in Registry for easy access
-		$user = $this->_authManager->user();
-		if( $user )
-		{
-			Registry::getInstance()->set( 'Auth.User', $user );
-			Registry::getInstance()->set( 'Auth.UserId', $user->getId() );
-			Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() );
-		}
+		Registry::getInstance()->set( 'Auth.User', $user );
+		Registry::getInstance()->set( 'Auth.UserId', $user->getId() );
+		Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() );
 	}
 
 	/**