diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php
index 92f71e4..9468d3c 100644
--- a/src/Controller/LoginController.php
+++ b/src/Controller/LoginController.php
@@ -352,7 +352,8 @@ public function getReturnUrl(Request $request, ?array $sessionTicket): string
         // Parse the query parameters and return them in an array
         $query = $this->parseQueryParameters($request, $sessionTicket);
         // Construct the ReturnTo URL
-        return $this->httpUtils->getSelfURLNoQuery() . '?' . http_build_query($query);
+        $returnToBase = Module::getModuleURL('casserver/login');
+        return $returnToBase . '?' . http_build_query($query);
     }
 
 
diff --git a/tests/src/Controller/LoginControllerTest.php b/tests/src/Controller/LoginControllerTest.php
index 0896d7f..04f824e 100644
--- a/tests/src/Controller/LoginControllerTest.php
+++ b/tests/src/Controller/LoginControllerTest.php
@@ -137,7 +137,7 @@ public static function loginOnAuthenticateParameters(): array
                     'ForceAuthn' => false,
                     'isPassive' => false,
                     // phpcs:ignore Generic.Files.LineLength.TooLong
-                    'ReturnTo' => 'http://localhost/?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php',
+                    'ReturnTo' => 'http://localhost/module.php/casserver/login?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php',
                 ],
                 [],
             ],
@@ -151,7 +151,7 @@ public static function loginOnAuthenticateParameters(): array
                     'ForceAuthn' => false,
                     'isPassive' => false,
                     // phpcs:ignore Generic.Files.LineLength.TooLong
-                    'ReturnTo' => 'http://localhost/?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&entityId=http%3A%2F%2Flocalhost%2FentityId%2Fsso',
+                    'ReturnTo' => 'http://localhost/module.php/casserver/login?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&entityId=http%3A%2F%2Flocalhost%2FentityId%2Fsso',
                 ],
                 [],
             ],
@@ -164,7 +164,7 @@ public static function loginOnAuthenticateParameters(): array
                     'ForceAuthn' => false,
                     'isPassive' => false,
                     // phpcs:ignore Generic.Files.LineLength.TooLong
-                    'ReturnTo' => 'http://localhost/?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&scope=desktop',
+                    'ReturnTo' => 'http://localhost/module.php/casserver/login?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&scope=desktop',
                     'saml:IDPList' => [
                         'http://localhost/entityId/sso/scope/A',
                         'http://localhost/entityId/sso/scope/B',
@@ -187,7 +187,7 @@ public static function loginOnAuthenticateParameters(): array
                     'ForceAuthn' => false,
                     'isPassive' => false,
                     // phpcs:ignore Generic.Files.LineLength.TooLong
-                    'ReturnTo' => 'http://localhost/?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&scope=desktop',
+                    'ReturnTo' => 'http://localhost/module.php/casserver/login?service=https%3A%2F%2Fexample.com%2Fssp%2Fmodule.php%2Fcas%2Flinkback.php&scope=desktop',
                     'saml:idp' => 'http://localhost/entityId/sso/scope/A',
                 ],
                 [