diff --git a/acceptance/tests/idp-apple.spec.ts b/acceptance/tests/idp-apple.spec.ts
index c9485053787..57cd320fd2e 100644
--- a/acceptance/tests/idp-apple.spec.ts
+++ b/acceptance/tests/idp-apple.spec.ts
@@ -34,7 +34,7 @@ test("login with Apple IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Apple
     // User authenticates in Apple
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -58,7 +58,7 @@ test("login with Apple IDP", async ({user, page}) => {
     // User is redirected to Apple
     // User authenticates in Apple and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -84,7 +84,7 @@ test("login with Apple IDP, no user existing - auto register", async ({user, pag
     // User authenticates in Apple
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Apple IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -100,7 +100,7 @@ test("login with Apple IDP, no user existing - auto register not possible", asyn
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Apple IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with Apple IDP, no user linked - auto link", async ({user, page}) =>
     // User authenticates in Apple with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Apple IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -150,5 +150,5 @@ test("login with Apple IDP, no user linked, user doesn't exist - no auto link",
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-generic-jwt.spec.ts b/acceptance/tests/idp-generic-jwt.spec.ts
index 2127b10a347..6ca3558dd64 100644
--- a/acceptance/tests/idp-generic-jwt.spec.ts
+++ b/acceptance/tests/idp-generic-jwt.spec.ts
@@ -31,7 +31,7 @@ test("login with Generic JWT IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Generic JWT
     // User authenticates in Generic JWT
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -55,7 +55,7 @@ test("login with Generic JWT IDP", async ({user, page}) => {
     // User is redirected to Generic JWT
     // User authenticates in Generic JWT and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -81,7 +81,7 @@ test("login with Generic JWT IDP, no user existing - auto register", async ({use
     // User authenticates in Generic JWT
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic JWT IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -97,7 +97,7 @@ test("login with Generic JWT IDP, no user existing - auto register not possible"
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic JWT IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -121,7 +121,7 @@ test("login with Generic JWT IDP, no user linked - auto link", async ({user, pag
     // User authenticates in Generic JWT with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic JWT IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -147,5 +147,5 @@ test("login with Generic JWT IDP, no user linked, user doesn't exist - no auto l
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-generic-oauth.spec.ts b/acceptance/tests/idp-generic-oauth.spec.ts
index 7f27e3167fa..0d55f399737 100644
--- a/acceptance/tests/idp-generic-oauth.spec.ts
+++ b/acceptance/tests/idp-generic-oauth.spec.ts
@@ -32,7 +32,7 @@ test("login with Generic OAuth IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Generic OAuth
     // User authenticates in Generic OAuth
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -56,7 +56,7 @@ test("login with Generic OAuth IDP", async ({user, page}) => {
     // User is redirected to Generic OAuth
     // User authenticates in Generic OAuth and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -82,7 +82,7 @@ test("login with Generic OAuth IDP, no user existing - auto register", async ({u
     // User authenticates in Generic OAuth
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OAuth IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -98,7 +98,7 @@ test("login with Generic OAuth IDP, no user existing - auto register not possibl
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OAuth IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -122,7 +122,7 @@ test("login with Generic OAuth IDP, no user linked - auto link", async ({user, p
     // User authenticates in Generic OAuth with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OAuth IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -148,5 +148,5 @@ test("login with Generic OAuth IDP, no user linked, user doesn't exist - no auto
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-generic-oidc.spec.ts b/acceptance/tests/idp-generic-oidc.spec.ts
index f3c9e59bd63..ed19a50a732 100644
--- a/acceptance/tests/idp-generic-oidc.spec.ts
+++ b/acceptance/tests/idp-generic-oidc.spec.ts
@@ -33,7 +33,7 @@ test("login with Generic OIDC IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Generic OIDC
     // User authenticates in Generic OIDC
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -57,7 +57,7 @@ test("login with Generic OIDC IDP", async ({user, page}) => {
     // User is redirected to Generic OIDC
     // User authenticates in Generic OIDC and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -83,7 +83,7 @@ test("login with Generic OIDC IDP, no user existing - auto register", async ({us
     // User authenticates in Generic OIDC
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OIDC IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -99,7 +99,7 @@ test("login with Generic OIDC IDP, no user existing - auto register not possible
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OIDC IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -123,7 +123,7 @@ test("login with Generic OIDC IDP, no user linked - auto link", async ({user, pa
     // User authenticates in Generic OIDC with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Generic OIDC IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -149,5 +149,5 @@ test("login with Generic OIDC IDP, no user linked, user doesn't exist - no auto
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-github-enterprise.spec.ts b/acceptance/tests/idp-github-enterprise.spec.ts
index 6bbcbc20265..ee7f5d8a5be 100644
--- a/acceptance/tests/idp-github-enterprise.spec.ts
+++ b/acceptance/tests/idp-github-enterprise.spec.ts
@@ -32,7 +32,7 @@ test("login with GitHub Enterprise IDP - auto redirect", async ({user, page}) =>
     // User is automatically redirected to GitHub Enterprise
     // User authenticates in GitHub Enterprise
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -56,7 +56,7 @@ test("login with GitHub Enterprise IDP", async ({user, page}) => {
     // User is redirected to GitHub Enterprise
     // User authenticates in GitHub Enterprise and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -83,7 +83,7 @@ test("login with GitHub Enterprise IDP, no user existing - auto register", async
     // User authenticates in GitHub Enterprise
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub Enterprise IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -99,7 +99,7 @@ test("login with GitHub Enterprise IDP, no user existing - auto register not pos
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub Enterprise IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with GitHub Enterprise IDP, no user linked - auto link", async ({use
     // User authenticates in GitHub Enterprise with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub Enterprise IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -152,5 +152,5 @@ test("login with GitHub Enterprise IDP, no user linked, user doesn't exist - no
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-github.spec.ts b/acceptance/tests/idp-github.spec.ts
index d6935f92915..0ac8c13193e 100644
--- a/acceptance/tests/idp-github.spec.ts
+++ b/acceptance/tests/idp-github.spec.ts
@@ -32,7 +32,7 @@ test("login with GitHub IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to GitHub
     // User authenticates in GitHub
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -56,7 +56,7 @@ test("login with GitHub IDP", async ({user, page}) => {
     // User is redirected to GitHub
     // User authenticates in GitHub and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -83,7 +83,7 @@ test("login with GitHub IDP, no user existing - auto register", async ({user, pa
     // User authenticates in GitHub
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -99,7 +99,7 @@ test("login with GitHub IDP, no user existing - auto register not possible", asy
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with GitHub IDP, no user linked - auto link", async ({user, page}) =
     // User authenticates in GitHub with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with GitHub IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -152,5 +152,5 @@ test("login with GitHub IDP, no user linked, user doesn't exist - no auto link",
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-gitlab-self-hosted.spec.ts b/acceptance/tests/idp-gitlab-self-hosted.spec.ts
index fe3b29439ea..00b0ec7c4af 100644
--- a/acceptance/tests/idp-gitlab-self-hosted.spec.ts
+++ b/acceptance/tests/idp-gitlab-self-hosted.spec.ts
@@ -32,7 +32,7 @@ test("login with Gitlab Self-Hosted IDP - auto redirect", async ({user, page}) =
     // User is automatically redirected to Gitlab Self-Hosted
     // User authenticates in Gitlab Self-Hosted
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -56,7 +56,7 @@ test("login with Gitlab Self-Hosted IDP", async ({user, page}) => {
     // User is redirected to Gitlab Self-Hosted
     // User authenticates in Gitlab Self-Hosted and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -83,7 +83,7 @@ test("login with Gitlab Self-Hosted IDP, no user existing - auto register", asyn
     // User authenticates in Gitlab Self-Hosted
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab Self-Hosted IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -99,7 +99,7 @@ test("login with Gitlab Self-Hosted IDP, no user existing - auto register not po
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab Self-Hosted IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with Gitlab Self-Hosted IDP, no user linked - auto link", async ({us
     // User authenticates in Gitlab Self-Hosted with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab Self-Hosted IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -152,5 +152,5 @@ test("login with Gitlab Self-Hosted IDP, no user linked, user doesn't exist - no
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-gitlab.spec.ts b/acceptance/tests/idp-gitlab.spec.ts
index 4504f670f9f..a94b1ac77d8 100644
--- a/acceptance/tests/idp-gitlab.spec.ts
+++ b/acceptance/tests/idp-gitlab.spec.ts
@@ -32,7 +32,7 @@ test("login with Gitlab IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Gitlab
     // User authenticates in Gitlab
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -56,7 +56,7 @@ test("login with Gitlab IDP", async ({user, page}) => {
     // User is redirected to Gitlab
     // User authenticates in Gitlab and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -83,7 +83,7 @@ test("login with Gitlab IDP, no user existing - auto register", async ({user, pa
     // User authenticates in Gitlab
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -99,7 +99,7 @@ test("login with Gitlab IDP, no user existing - auto register not possible", asy
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with Gitlab IDP, no user linked - auto link", async ({user, page}) =
     // User authenticates in Gitlab with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Gitlab IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -152,5 +152,5 @@ test("login with Gitlab IDP, no user linked, user doesn't exist - no auto link",
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-google.spec.ts b/acceptance/tests/idp-google.spec.ts
index 0c0d777fe4a..8c13449adde 100644
--- a/acceptance/tests/idp-google.spec.ts
+++ b/acceptance/tests/idp-google.spec.ts
@@ -31,7 +31,7 @@ test("login with Google IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Google
     // User authenticates in Google
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -55,7 +55,7 @@ test("login with Google IDP", async ({user, page}) => {
     // User is redirected to Google
     // User authenticates in Google and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -81,7 +81,7 @@ test("login with Google IDP, no user existing - auto register", async ({user, pa
     // User authenticates in Google
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Google IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -97,7 +97,7 @@ test("login with Google IDP, no user existing - auto register not possible", asy
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Google IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -121,7 +121,7 @@ test("login with Google IDP, no user linked - auto link", async ({user, page}) =
     // User authenticates in Google with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Google IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -147,5 +147,5 @@ test("login with Google IDP, no user linked, user doesn't exist - no auto link",
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-ldap.spec.ts b/acceptance/tests/idp-ldap.spec.ts
index 8bd71b16b41..fc667edee4c 100644
--- a/acceptance/tests/idp-ldap.spec.ts
+++ b/acceptance/tests/idp-ldap.spec.ts
@@ -31,7 +31,7 @@ test("login with LDAP IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to LDAP
     // User authenticates in LDAP
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -55,7 +55,7 @@ test("login with LDAP IDP", async ({user, page}) => {
     // User is redirected to LDAP
     // User authenticates in LDAP and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -81,7 +81,7 @@ test("login with LDAP IDP, no user existing - auto register", async ({user, page
     // User authenticates in LDAP
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with LDAP IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -97,7 +97,7 @@ test("login with LDAP IDP, no user existing - auto register not possible", async
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with LDAP IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -121,7 +121,7 @@ test("login with LDAP IDP, no user linked - auto link", async ({user, page}) =>
     // User authenticates in LDAP with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with LDAP IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -147,5 +147,5 @@ test("login with LDAP IDP, no user linked, user doesn't exist - no auto link", a
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-microsoft.spec.ts b/acceptance/tests/idp-microsoft.spec.ts
index 8e37d11de1f..26ffcc10642 100644
--- a/acceptance/tests/idp-microsoft.spec.ts
+++ b/acceptance/tests/idp-microsoft.spec.ts
@@ -34,7 +34,7 @@ test("login with Microsoft IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to Microsoft
     // User authenticates in Microsoft
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -58,7 +58,7 @@ test("login with Microsoft IDP", async ({user, page}) => {
     // User is redirected to Microsoft
     // User authenticates in Microsoft and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -84,7 +84,7 @@ test("login with Microsoft IDP, no user existing - auto register", async ({user,
     // User authenticates in Microsoft
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Microsoft IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -100,7 +100,7 @@ test("login with Microsoft IDP, no user existing - auto register not possible",
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Microsoft IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -124,7 +124,7 @@ test("login with Microsoft IDP, no user linked - auto link", async ({user, page}
     // User authenticates in Microsoft with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with Microsoft IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -150,5 +150,5 @@ test("login with Microsoft IDP, no user linked, user doesn't exist - no auto lin
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/idp-saml.spec.ts b/acceptance/tests/idp-saml.spec.ts
index a57e19d8482..890965180b5 100644
--- a/acceptance/tests/idp-saml.spec.ts
+++ b/acceptance/tests/idp-saml.spec.ts
@@ -33,7 +33,7 @@ test("login with SAML IDP - auto redirect", async ({user, page}) => {
     // User is automatically redirected to SAML
     // User authenticates in SAML
     // User is redirect to ZITADEL login
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -57,7 +57,7 @@ test("login with SAML IDP", async ({user, page}) => {
     // User is redirected to SAML
     // User authenticates in SAML and gets an error
     // User is redirect to ZITADEL login automatically
-    // User is redirected to app automatically
+    // User is redirected to app automatically (default redirect url)
 });
 
  
@@ -84,7 +84,7 @@ test("login with SAML IDP, no user existing - auto register", async ({user, page
     // User authenticates in SAML
     // User is redirect to ZITADEL login
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with SAML IDP, no user existing - auto register not possible", async ({user, page}) => {
@@ -100,7 +100,7 @@ test("login with SAML IDP, no user existing - auto register not possible", async
     // User fills missing information
     // User clicks register button
     // User is created in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with SAML IDP, no user existing - auto register enabled - manual creation disabled, creation not possible", async ({user, page}) => {
@@ -125,7 +125,7 @@ test("login with SAML IDP, no user linked - auto link", async ({user, page}) =>
     // User authenticates in SAML with user@zitadel.com
     // User is redirect to ZITADEL login
     // User is linked with existing user in ZITADEL
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("login with SAML IDP, no user linked, user doesn't exist - no auto link", async ({user, page}) => {
@@ -153,5 +153,5 @@ test("login with SAML IDP, no user linked, user doesn't exist - no auto link", a
     // User is redirect to ZITADEL login
     // User with email address user@zitadel.com can not be found
     // User is prompted to link the account manually
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/login-configuration-possiblities.spec.ts b/acceptance/tests/login-configuration-possiblities.spec.ts
new file mode 100644
index 00000000000..0fb3b78975a
--- /dev/null
+++ b/acceptance/tests/login-configuration-possiblities.spec.ts
@@ -0,0 +1,91 @@
+import {test as base} from "@playwright/test";
+import {PasswordUser} from './user';
+import path from 'path';
+import dotenv from 'dotenv';
+import {loginScreenExpect, loginWithPassword, startLogin} from "./login";
+import {loginnameScreenExpect} from "./loginname-screen";
+import {passwordScreenExpect} from "./password-screen";
+import {loginname} from "./loginname";
+import {password} from "./password";
+
+// Read from ".env" file.
+dotenv.config({path: path.resolve(__dirname, '.env.local')});
+
+const test = base.extend<{ user: PasswordUser }>({
+    user: async ({page}, use) => {
+        const user = new PasswordUser({
+            email: "password@example.com",
+            firstName: "first",
+            lastName: "last",
+            password: "Password1!",
+            organization: "",
+        });
+        await user.ensure(page);
+        await use(user);
+    },
+});
+
+test("login with mfa setup, mfa setup prompt", async ({user, page}) => {
+    // Given the organization has set "multifactor init check time" to 40
+    // Given the organization has enabled all possible mfa types 
+    // Given the user has a password but no mfa registered and never authenticated
+
+    // enter login name
+    // enter password
+    // User is prompted to setup a mfa, all possible mfa providers are listed, the user can choose the provider
+});
+
+test("login with mfa setup, mfa setup prompt", async ({user, page}) => {
+    // Given the organization has set "multifactor init check time" to 0
+    // Given the organization has enabled all possible mfa types 
+    // Given the user has a password but no mfa registered and never authenticated
+
+    // enter login name
+    // enter password
+    // user is redirected to app
+});
+
+test("login with mfa setup, force mfa for local authenticated users", async ({user, page}) => {
+    // Given the organization has enabled force mfa for local authentiacted users
+    // Given the organization has enabled all possible mfa types 
+    // Given the user has a password but no mfa registered
+
+    // enter login name
+    // enter password
+    // User is prompted to setup a mfa, all possible mfa providers are listed, the user can choose the provider
+});
+
+
+test("login with mfa setup, force mfa - local user", async ({user, page}) => {
+    // Given the organization has enabled force mfa for local authentiacted users
+    // Given the organization has enabled all possible mfa types 
+    // Given the user has a password but no mfa registered
+
+    // enter login name
+    // enter password
+    // User is prompted to setup a mfa, all possible mfa providers are listed, the user can choose the provider
+});
+
+
+test("login with mfa setup, force mfa - external user", async ({user, page}) => {
+    // Given the organization has enabled force mfa
+    // Given the organization has enabled all possible mfa types 
+    // Given the user has an idp but no mfa registered
+
+    // enter login name
+    // redirect to configured external idp
+    // User is prompted to setup a mfa, all possible mfa providers are listed, the user can choose the provider
+});
+
+
+test("login with mfa setup, force mfa - external user", async ({user, page}) => {
+    // Given the organization has a password lockout policy set to 1 on the max password attempts
+    // Given the user has only a password as auth methos
+
+    // enter login name
+    // enter wrong password
+    // User will get an error "Wrong password"
+    // enter password
+    // User will get an error "Max password attempts reached - user is locked. Please reach out to your administrator"
+});
+
diff --git a/acceptance/tests/register.spec.ts b/acceptance/tests/register.spec.ts
index 0e08db56143..f8711e3ffff 100644
--- a/acceptance/tests/register.spec.ts
+++ b/acceptance/tests/register.spec.ts
@@ -28,3 +28,151 @@ test("register with passkey", async ({page}) => {
     await registerWithPasskey(page, firstname, lastname, username)
     await loginScreenExpect(page, firstname + " " + lastname);
 });
+
+test("register with username and password - only password enabled", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and "password"
+    // User is redirected to app (default redirect url)
+});
+
+test("register with username and password - wrong password not enough characters", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given password policy is set to 8 characters and must include number, symbol, lower and upper letter
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and a password thats to short
+    // Error is shown "Password doesn't match the policy - it must have at least 8 characters"
+});
+
+test("register with username and password - wrong password number missing", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given password policy is set to 8 characters and must include number, symbol, lower and upper letter
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and a password without a number
+    // Error is shown "Password doesn't match the policy - number missing"
+});
+
+test("register with username and password - wrong password upper case missing", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given password policy is set to 8 characters and must include number, symbol, lower and upper letter
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and a password without an upper case
+    // Error is shown "Password doesn't match the policy - uppercase letter missing"
+});
+
+test("register with username and password - wrong password lower case missing", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given password policy is set to 8 characters and must include number, symbol, lower and upper letter
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and a password without an lower case
+    // Error is shown "Password doesn't match the policy - lowercase letter missing"
+});
+
+
+test("register with username and password - wrong password symboo missing", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is not enabled 
+    // Given password policy is set to 8 characters and must include number, symbol, lower and upper letter
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // Only password is shown as an option - no passkey
+    // User enters "firstname", "lastname", "username" and a password without an symbol
+    // Error is shown "Password doesn't match the policy - symbol missing"
+});
+
+test("register with username and password - password and passkey enabled", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is enabled
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // User enters "firstname", "lastname", "username"
+    // Password and passkey are shown as authentication option
+    // User clicks password
+    // User enters password
+    // User is redirected to app (default redirect url)
+});
+
+test("register with username and passkey - password and passkey enabled", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given on the default organization passkey is enabled
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration page
+    // User enters "firstname", "lastname", "username"
+    // Password and passkey are shown as authentication option
+    // User clicks passkey
+    // Passkey is opened automatically
+    // User verifies passkey
+    // User is redirected to app (default redirect url)
+});
+
+
+test("register with username and password - registration disabled", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization no idp is configured and enabled
+    // Given user doesn't exist
+
+    // Button "register new user" is not available
+});
+
+test("register with username and password - multiple registration options", async ({user, page}) => {
+    // Given on the default organization "username and password is allowed" is enabled
+    // Given on the default organization "username registeration allowed" is enabled
+    // Given on the default organization one idp is configured and enabled
+    // Given user doesn't exist
+
+    // Click on button "register new user"
+    // User is redirected to registration options
+    // Local User and idp button are shown
+    // User clicks idp button
+    // User enters "firstname", "lastname", "username" and "password"
+    // User clicks next
+    // User is redirected to app (default redirect url)
+});
diff --git a/acceptance/tests/username-password-otp_email.spec.ts b/acceptance/tests/username-password-otp_email.spec.ts
index 55a05876a5a..43749cb203e 100644
--- a/acceptance/tests/username-password-otp_email.spec.ts
+++ b/acceptance/tests/username-password-otp_email.spec.ts
@@ -33,7 +33,7 @@ test("username, password and email otp login, enter code manually", async ({user
     // User enters password
     // User receives an email with a verification code
     // User enters the code into the ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -45,7 +45,7 @@ test("username, password and email otp login, click link in email", async ({user
     // User enters password
     // User receives an email with a verification code
     // User clicks link in the email
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("username, password and email otp login, resend code", async ({user, page}) => {
@@ -58,7 +58,7 @@ test("username, password and email otp login, resend code", async ({user, page})
     // User clicks resend code
     // User receives a new email with a verification code
     // User enters the new code in the ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 test("username, password and email otp login, wrong code", async ({user, page}) => {
@@ -82,5 +82,5 @@ test("username, password and email otp login, multiple mfa options", async ({use
     // User clicks button to use sms otp as second factor
     // User receives an sms with a verification code
     // User enters code in ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/username-password-otp_sms.spec.ts b/acceptance/tests/username-password-otp_sms.spec.ts
index d80e03fac8d..f762dc8c0d4 100644
--- a/acceptance/tests/username-password-otp_sms.spec.ts
+++ b/acceptance/tests/username-password-otp_sms.spec.ts
@@ -42,7 +42,7 @@ test("username, password and sms otp login", async ({user, page}) => {
     // User enters password
     // User receives an sms with a verification code
     // User enters the code into the ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -55,7 +55,7 @@ test("username, password and sms otp login, resend code", async ({user, page}) =
     // User receives an sms with a verification code
     // User clicks resend code
     // User receives a new sms with a verification code
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
diff --git a/acceptance/tests/username-password-totp.spec.ts b/acceptance/tests/username-password-totp.spec.ts
index d81ba9f09eb..85ea828e08b 100644
--- a/acceptance/tests/username-password-totp.spec.ts
+++ b/acceptance/tests/username-password-totp.spec.ts
@@ -32,7 +32,7 @@ test("username, password and totp login", async ({user, page}) => {
     // User enters password
     // Screen for entering the code is shown directly
     // User enters the code into the ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -59,5 +59,5 @@ test("username, password and totp login, multiple mfa options", async ({user, pa
     // User clicks button to use email otp instead
     // User receives an email with a verification code
     // User enters code in ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/username-password-u2f.spec.ts b/acceptance/tests/username-password-u2f.spec.ts
index fad16a2fc57..0f87175ad0d 100644
--- a/acceptance/tests/username-password-u2f.spec.ts
+++ b/acceptance/tests/username-password-u2f.spec.ts
@@ -33,7 +33,7 @@ test("username, password and u2f login", async ({user, page}) => {
     // User enters password
     // Popup for u2f is directly opened
     // User verifies u2f
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
 
 
@@ -48,5 +48,5 @@ test("username, password and u2f login, multiple mfa options", async ({user, pag
     // User clicks button to use email otp as second factor
     // User receives an email with a verification code
     // User enters code in ui
-    // User is redirected to the app
+    // User is redirected to the app (default redirect url)
 });
diff --git a/acceptance/tests/username-password.spec.ts b/acceptance/tests/username-password.spec.ts
index ee97f21bc64..c7f4e8227ca 100644
--- a/acceptance/tests/username-password.spec.ts
+++ b/acceptance/tests/username-password.spec.ts
@@ -62,6 +62,15 @@ test("username and password login, initial password change", async ({user, page}
     // create new password
 });
 
+
+test("username and password login, reset password hidden", async ({user, page}) => {
+    // Given the organization has enabled "Password reset hidden" in the login policy
+    // Given username password login is enabled on the users organization
+
+    // enter login name
+    // password reset link should not be shown on password screen
+});
+
 test("username and password login, reset password - enter code manually", async ({user, page}) => {
     // Given user has forgotten password and clicks the forgot password button
     // Given username password login is enabled on the users organization
@@ -69,7 +78,7 @@ test("username and password login, reset password - enter code manually", async
     // enter login name
     // click password forgotten
     // enter code from email
-    // user is redirected to app
+    // user is redirected to app (default redirect url)
 });
 
 test("username and password login, reset password - click link", async ({user, page}) => {
@@ -80,7 +89,7 @@ test("username and password login, reset password - click link", async ({user, p
     // click password forgotten
     // click link in email
     // set new password
-    // redirect to app
+    // redirect to app (default redirect url)
 });
 
 test("username and password login, reset password, resend code", async ({user, page}) => {
@@ -91,5 +100,55 @@ test("username and password login, reset password, resend code", async ({user, p
     // click password forgotten
     // click resend code
     // enter code from second email
-    // user is authenticated
-});
\ No newline at end of file
+    // user is redirected to app (default redirect url)
+});
+
+test("email login enabled", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given no other user with the same email address exists
+
+    // enter email address "test@zitadel.com " in login screen
+    // user will get to password screen
+});
+
+test("email login disabled", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given no other user with the same email address exists
+
+    // enter email address "test@zitadel.com" in login screen
+    // user will see error message "user not found"
+});
+
+test("email login enabled - multiple users", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given a second user with the username "testuser2", email test@zitadel.com and phone number 0711111111 exists
+
+    // enter email address "test@zitadel.com" in login screen
+    // user will see error message "user not found"
+});
+
+
+test("phone login enabled", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given no other user with the same phon number exists
+
+    // enter phone number "0711111111" in login screen
+    // user will get to password screen
+});
+
+test("phone login disabled", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given no other user with the same phone number exists
+
+    // enter phone number "0711111111" in login screen
+    // user will see error message "user not found"
+});
+
+test("phone login enabled - multiple users", async ({user, page}) => {
+    // Given user with the username "testuser", email test@zitadel.com and phone number 0711111111 exists
+    // Given a second user with the username "testuser2", email test@zitadel.com and phone number 0711111111 exists
+
+    // enter phone number "0711111111" in login screen
+    // user will see error message "user not found"
+});
+