diff --git a/src/Controller/AuthorizationController.php b/src/Controller/AuthorizationController.php
index 7b5215e4..7d357ffb 100644
--- a/src/Controller/AuthorizationController.php
+++ b/src/Controller/AuthorizationController.php
@@ -101,12 +101,12 @@ public function indexAction(Request $request): Response
                 OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE
             );
 
-            $authRequest->setUser($this->userConverter->toLeague($event->getUser()));
-
             if ($response = $event->getResponse()) {
                 return $response;
             }
 
+            $authRequest->setUser($this->userConverter->toLeague($event->getUser()));
+
             $authRequest->setAuthorizationApproved($event->getAuthorizationResolution());
 
             $response = $this->server->completeAuthorizationRequest($authRequest, $serverResponse);