diff --git a/backend/internal/handler/auth_handler.go b/backend/internal/handler/auth_handler.go
index 4d99e49a..7892f95e 100644
--- a/backend/internal/handler/auth_handler.go
+++ b/backend/internal/handler/auth_handler.go
@@ -841,6 +841,15 @@ func (h *AuthHandler) resolveUserfrontURL(c *fiber.Ctx) string {
 	if baseURL == "" {
 		return strings.TrimRight(envURL, "/")
 	}
+
+	envParsed, envErr := url.Parse(strings.TrimRight(envURL, "/"))
+	baseParsed, baseErr := url.Parse(strings.TrimRight(baseURL, "/"))
+	if envErr == nil && baseErr == nil &&
+		strings.EqualFold(envParsed.Hostname(), baseParsed.Hostname()) &&
+		envParsed.Scheme == "https" && baseParsed.Scheme == "http" {
+		return strings.TrimRight(envURL, "/")
+	}
+
 	return baseURL
 }