diff --git a/adminfront/scripts/runtime-mode.sh b/adminfront/scripts/runtime-mode.sh
index 8191bf0d..aa41dce1 100644
--- a/adminfront/scripts/runtime-mode.sh
+++ b/adminfront/scripts/runtime-mode.sh
@@ -19,8 +19,8 @@ fi
 
 if [ "$mode" = "production" ]; then
   echo "Running in production mode with Vite preview..."
-  exec sh -c "npm run build && npm run preview -- --host 127.0.0.1"
+  exec sh -c "npm run build && npm run preview -- --host 0.0.0.0"
 fi
 
 echo "Running in development mode..."
-exec npm run dev -- --host 127.0.0.1
+exec npm run dev -- --host 0.0.0.0
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
 }
 
diff --git a/devfront/scripts/runtime-mode.sh b/devfront/scripts/runtime-mode.sh
index 8191bf0d..aa41dce1 100644
--- a/devfront/scripts/runtime-mode.sh
+++ b/devfront/scripts/runtime-mode.sh
@@ -19,8 +19,8 @@ fi
 
 if [ "$mode" = "production" ]; then
   echo "Running in production mode with Vite preview..."
-  exec sh -c "npm run build && npm run preview -- --host 127.0.0.1"
+  exec sh -c "npm run build && npm run preview -- --host 0.0.0.0"
 fi
 
 echo "Running in development mode..."
-exec npm run dev -- --host 127.0.0.1
+exec npm run dev -- --host 0.0.0.0