diff --git a/src/CirclicalUser/Strategy/RedirectStrategy.php b/src/CirclicalUser/Strategy/RedirectStrategy.php
index <HASH>..<HASH> 100644
--- a/src/CirclicalUser/Strategy/RedirectStrategy.php
+++ b/src/CirclicalUser/Strategy/RedirectStrategy.php
@@ -45,8 +45,11 @@ class RedirectStrategy implements DenyStrategyInterface
             ]));
             $event->setParam('authRedirect', true);
 
-            if ($requestData = $event->getRequest() && isset($requestData['REQUEST_URI'], $requestData['SCRIPT_NAME'])) {
-                $event->setParam('authRedirectTo', $requestData['REQUEST_URI'] . $requestData['SCRIPT_NAME']);
+            /** @var \Zend\Http\PhpEnvironment\Request $requestData */
+            $requestData = $event->getRequest();
+
+            if ($requestData->getServer('REQUEST_URI')) {
+                $event->setParam('authRedirectTo', $requestData->getServer('REQUEST_URI'));
             }
 
             return true;
Adding an authRedirect parameter to the MvcEvent in cases where the redirect strategy modified the expected route.