diff --git a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
index b9cc93d1a..b979e5184 100644
--- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
@@ -124,9 +124,7 @@ public class AccountWebController {
 
             if (applicationProperties.getEnterpriseEdition().isSsoAutoLogin()) {
                 return "redirect:"
-                        + SPDFApplication.getStaticBaseUrl()
-                        + ":"
-                        + SPDFApplication.getStaticPort()
+                        + request.getRequestURL()
                         + saml2AuthenticationPath;
             } else {
                 providerList.put(saml2AuthenticationPath, samlIdp + " (SAML 2)");