diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index db4d5aa5c8..773a82a846 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -57,6 +57,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Generate stubs
+        run: pnpm generate
+
       - name: Build for Docker
         run: NEXT_PUBLIC_BASE_PATH=/ui/v2/login pnpm build:docker
 
diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts
index 7a0c147865..61daffd185 100644
--- a/apps/login/src/app/login/route.ts
+++ b/apps/login/src/app/login/route.ts
@@ -81,9 +81,12 @@ export async function GET(request: NextRequest) {
 
   // internal request id which combines authRequest and samlRequest with the prefix oidc_ or saml_
   let requestId =
-    searchParams.get("requestId") ||
-    `oidc_${oidcRequestId}` ||
-    `saml_${samlRequestId}`;
+    searchParams.get("requestId") ??
+    (oidcRequestId
+      ? `oidc_${oidcRequestId}`
+      : samlRequestId
+        ? `saml_${samlRequestId}`
+        : undefined);
 
   const sessionId = searchParams.get("sessionId");
 
@@ -470,9 +473,10 @@ export async function GET(request: NextRequest) {
       if (url && binding.case === "redirect") {
         return NextResponse.redirect(url);
       } else if (url && binding.case === "post") {
+        // Create form data after SAML standard
         const formData = {
-          key1: "value1",
-          key2: "value2",
+          RelayState: binding.value.relayState,
+          SAMLResponse: binding.value.samlResponse,
         };
 
         // Convert form data to URL-encoded string