diff --git a/internal/cli/acul_config.go b/internal/cli/acul_config.go
index 268827f52..7616c9660 100644
--- a/internal/cli/acul_config.go
+++ b/internal/cli/acul_config.go
@@ -95,25 +95,25 @@ var (
 		IsRequired: false,
 	}
 	ScreenPromptMap = map[string]string{
-		"signup-id":                                      "signup-id",
-		"signup-password":                                "signup-password",
+		"interstitial-captcha":                           "captcha",
+		"email-identifier-challenge":                     "email-identifier-challenge",
+		"phone-identifier-challenge":                     "phone-identifier-challenge",
+		"phone-identifier-enrollment":                    "phone-identifier-enrollment",
 		"login-id":                                       "login-id",
 		"login-password":                                 "login-password",
+		"signup-id":                                      "signup-id",
+		"signup-password":                                "signup-password",
+		"login":                                          "login",
+		"signup":                                         "signup",
 		"login-passwordless-email-code":                  "login-passwordless",
 		"login-passwordless-sms-otp":                     "login-passwordless",
-		"phone-identifier-enrollment":                    "phone-identifier-enrollment",
-		"phone-identifier-challenge":                     "phone-identifier-challenge",
-		"email-identifier-challenge":                     "email-identifier-challenge",
 		"passkey-enrollment":                             "passkeys",
 		"passkey-enrollment-local":                       "passkeys",
-		"interstitial-captcha":                           "captcha",
-		"login":                                          "login",
-		"signup":                                         "signup",
-		"reset-password-request":                         "reset-password",
-		"reset-password-email":                           "reset-password",
 		"reset-password":                                 "reset-password",
-		"reset-password-success":                         "reset-password",
+		"reset-password-email":                           "reset-password",
 		"reset-password-error":                           "reset-password",
+		"reset-password-request":                         "reset-password",
+		"reset-password-success":                         "reset-password",
 		"reset-password-mfa-email-challenge":             "reset-password",
 		"reset-password-mfa-otp-challenge":               "reset-password",
 		"reset-password-mfa-push-challenge-push":         "reset-password",
@@ -123,30 +123,23 @@ var (
 		"reset-password-mfa-recovery-code-challenge":     "reset-password",
 		"reset-password-mfa-webauthn-platform-challenge": "reset-password",
 		"reset-password-mfa-webauthn-roaming-challenge":  "reset-password",
+		"mfa-begin-enroll-options":                       "mfa",
 		"mfa-detect-browser-capabilities":                "mfa",
 		"mfa-enroll-result":                              "mfa",
-		"mfa-begin-enroll-options":                       "mfa",
 		"mfa-login-options":                              "mfa",
 		"mfa-email-challenge":                            "mfa-email",
 		"mfa-email-list":                                 "mfa-email",
-		"mfa-country-codes":                              "mfa-sms",
-		"mfa-sms-challenge":                              "mfa-sms",
-		"mfa-sms-enrollment":                             "mfa-sms",
-		"mfa-sms-list":                                   "mfa-sms",
 		"mfa-push-challenge-push":                        "mfa-push",
 		"mfa-push-enrollment-qr":                         "mfa-push",
 		"mfa-push-list":                                  "mfa-push",
 		"mfa-push-welcome":                               "mfa-push",
-		"accept-invitation":                              "invitation",
-		"organization-selection":                         "organizations",
-		"organization-picker":                            "organizations",
+		"mfa-country-codes":                              "mfa-sms",
+		"mfa-sms-challenge":                              "mfa-sms",
+		"mfa-sms-enrollment":                             "mfa-sms",
+		"mfa-sms-list":                                   "mfa-sms",
 		"mfa-otp-challenge":                              "mfa-otp",
 		"mfa-otp-enrollment-code":                        "mfa-otp",
 		"mfa-otp-enrollment-qr":                          "mfa-otp",
-		"device-code-activation":                         "device-flow",
-		"device-code-activation-allowed":                 "device-flow",
-		"device-code-activation-denied":                  "device-flow",
-		"device-code-confirmation":                       "device-flow",
 		"mfa-phone-challenge":                            "mfa-phone",
 		"mfa-phone-enrollment":                           "mfa-phone",
 		"mfa-voice-challenge":                            "mfa-voice",
@@ -154,12 +147,6 @@ var (
 		"mfa-recovery-code-challenge":                    "mfa-recovery-code",
 		"mfa-recovery-code-enrollment":                   "mfa-recovery-code",
 		"mfa-recovery-code-challenge-new-code":           "mfa-recovery-code",
-		"redeem-ticket":                                  "common",
-		"email-verification-result":                      "email-verification",
-		"login-email-verification":                       "login-email-verification",
-		"logout":                                         "logout",
-		"logout-aborted":                                 "logout",
-		"logout-complete":                                "logout",
 		"mfa-webauthn-change-key-nickname":               "mfa-webauthn",
 		"mfa-webauthn-enrollment-success":                "mfa-webauthn",
 		"mfa-webauthn-error":                             "mfa-webauthn",
@@ -167,6 +154,26 @@ var (
 		"mfa-webauthn-platform-enrollment":               "mfa-webauthn",
 		"mfa-webauthn-roaming-challenge":                 "mfa-webauthn",
 		"mfa-webauthn-roaming-enrollment":                "mfa-webauthn",
+		"mfa-webauthn-not-available-error":               "mfa-webauthn",
+		"accept-invitation":                              "invitation",
+		"organization-picker":                            "organizations",
+		"organization-selection":                         "organizations",
+		"device-code-activation":                         "device-flow",
+		"device-code-activation-allowed":                 "device-flow",
+		"device-code-activation-denied":                  "device-flow",
+		"device-code-confirmation":                       "device-flow",
+		"redeem-ticket":                                  "common",
+		"email-verification-result":                      "email-verification",
+		"login-email-verification":                       "login-email-verification",
+		"logout":                                         "logout",
+		"logout-aborted":                                 "logout",
+		"logout-complete":                                "logout",
+		"brute-force-protection-unblock":                 "brute-force-protection",
+		"brute-force-protection-unblock-failure":         "brute-force-protection",
+		"brute-force-protection-unblock-success":         "brute-force-protection",
+		"consent":                                        "consent",
+		"customized-consent":                             "customized-consent",
+		"email-otp-challenge":                            "email-otp-challenge",
 	}
 )
 
diff --git a/internal/cli/universal_login_customize.go b/internal/cli/universal_login_customize.go
index c46da33d2..ef274c8db 100644
--- a/internal/cli/universal_login_customize.go
+++ b/internal/cli/universal_login_customize.go
@@ -99,42 +99,63 @@ var allowedPromptsWithPartials = []management.PromptType{
 }
 
 var PromptScreenMap = map[string][]string{
-	"signup-id":                   {"signup-id"},
-	"signup-password":             {"signup-password"},
+	"captcha":                     {"interstitial-captcha"},
+	"email-identifier-challenge":  {"email-identifier-challenge"},
 	"login-id":                    {"login-id"},
 	"login-password":              {"login-password"},
 	"login-passwordless":          {"login-passwordless-email-code", "login-passwordless-sms-otp"},
-	"phone-identifier-enrollment": {"phone-identifier-enrollment"},
-	"phone-identifier-challenge":  {"phone-identifier-challenge"},
-	"email-identifier-challenge":  {"email-identifier-challenge"},
 	"passkeys":                    {"passkey-enrollment", "passkey-enrollment-local"},
-	"captcha":                     {"interstitial-captcha"},
+	"phone-identifier-challenge":  {"phone-identifier-challenge"},
+	"phone-identifier-enrollment": {"phone-identifier-enrollment"},
+	"signup-id":                   {"signup-id"},
+	"signup-password":             {"signup-password"},
 	"login":                       {"login"},
 	"signup":                      {"signup"},
-	"reset-password": {"reset-password-request", "reset-password-email", "reset-password", "reset-password-success", "reset-password-error",
-		"reset-password-mfa-email-challenge", "reset-password-mfa-otp-challenge", "reset-password-mfa-push-challenge-push",
-		"reset-password-mfa-sms-challenge", "reset-password-mfa-phone-challenge", "reset-password-mfa-voice-challenge",
-		"reset-password-mfa-recovery-code-challenge", "reset-password-mfa-webauthn-platform-challenge", "reset-password-mfa-webauthn-roaming-challenge"},
-	"mfa":                      {"mfa-detect-browser-capabilities", "mfa-enroll-result", "mfa-begin-enroll-options", "mfa-login-options"},
-	"mfa-email":                {"mfa-email-challenge", "mfa-email-list"},
-	"mfa-sms":                  {"mfa-country-codes", "mfa-sms-challenge", "mfa-sms-enrollment", "mfa-sms-list"},
-	"mfa-push":                 {"mfa-push-challenge-push", "mfa-push-enrollment-qr", "mfa-push-list", "mfa-push-welcome"},
-	"invitation":               {"accept-invitation"},
-	"organizations":            {"organization-selection", "organization-picker"},
-	"mfa-otp":                  {"mfa-otp-challenge", "mfa-otp-enrollment-code", "mfa-otp-enrollment-qr"},
-	"device-flow":              {"device-code-activation", "device-code-activation-allowed", "device-code-activation-denied", "device-code-confirmation"},
-	"mfa-phone":                {"mfa-phone-challenge", "mfa-phone-enrollment"},
-	"mfa-voice":                {"mfa-voice-challenge", "mfa-voice-enrollment"},
-	"mfa-recovery-code":        {"mfa-recovery-code-challenge", "mfa-recovery-code-enrollment", "mfa-recovery-code-challenge-new-code"},
-	"common":                   {"redeem-ticket"},
-	"email-verification":       {"email-verification-result"},
-	"login-email-verification": {"login-email-verification"},
-	"logout":                   {"logout", "logout-aborted", "logout-complete"},
-	"mfa-webauthn": {"mfa-webauthn-change-key-nickname", "mfa-webauthn-enrollment-success", "mfa-webauthn-error", "mfa-webauthn-platform-challenge",
-		"mfa-webauthn-platform-enrollment", "mfa-webauthn-roaming-challenge", "mfa-webauthn-roaming-enrollment", "mfa-webauthn-not-available-error"},
-	"consent":             {"consent"},
-	"customized-consent":  {"customized-consent"},
-	"email-otp-challenge": {"email-otp-challenge"},
+	"mfa":                         {"mfa-begin-enroll-options", "mfa-detect-browser-capabilities", "mfa-enroll-result", "mfa-login-options"},
+	"mfa-email":                   {"mfa-email-challenge", "mfa-email-list"},
+	"mfa-push":                    {"mfa-push-challenge-push", "mfa-push-enrollment-qr", "mfa-push-list", "mfa-push-welcome"},
+	"mfa-sms":                     {"mfa-country-codes", "mfa-sms-challenge", "mfa-sms-enrollment", "mfa-sms-list"},
+	"mfa-otp":                     {"mfa-otp-challenge", "mfa-otp-enrollment-code", "mfa-otp-enrollment-qr"},
+	"mfa-phone":                   {"mfa-phone-challenge", "mfa-phone-enrollment"},
+	"mfa-voice":                   {"mfa-voice-challenge", "mfa-voice-enrollment"},
+	"mfa-recovery-code":           {"mfa-recovery-code-challenge", "mfa-recovery-code-enrollment", "mfa-recovery-code-challenge-new-code"},
+	"invitation":                  {"accept-invitation"},
+	"organizations":               {"organization-picker", "organization-selection"},
+	"device-flow":                 {"device-code-activation", "device-code-activation-allowed", "device-code-activation-denied", "device-code-confirmation"},
+	"common":                      {"redeem-ticket"},
+	"email-verification":          {"email-verification-result"},
+	"login-email-verification":    {"login-email-verification"},
+	"logout":                      {"logout", "logout-aborted", "logout-complete"},
+	"brute-force-protection":      {"brute-force-protection-unblock", "brute-force-protection-unblock-failure", "brute-force-protection-unblock-success"},
+	"consent":                     {"consent"},
+	"customized-consent":          {"customized-consent"},
+	"email-otp-challenge":         {"email-otp-challenge"},
+	"mfa-webauthn": {
+		"mfa-webauthn-change-key-nickname",
+		"mfa-webauthn-enrollment-success",
+		"mfa-webauthn-error",
+		"mfa-webauthn-platform-challenge",
+		"mfa-webauthn-platform-enrollment",
+		"mfa-webauthn-roaming-challenge",
+		"mfa-webauthn-roaming-enrollment",
+		"mfa-webauthn-not-available-error",
+	},
+	"reset-password": {
+		"reset-password",
+		"reset-password-email",
+		"reset-password-error",
+		"reset-password-request",
+		"reset-password-success",
+		"reset-password-mfa-email-challenge",
+		"reset-password-mfa-otp-challenge",
+		"reset-password-mfa-push-challenge-push",
+		"reset-password-mfa-sms-challenge",
+		"reset-password-mfa-phone-challenge",
+		"reset-password-mfa-voice-challenge",
+		"reset-password-mfa-recovery-code-challenge",
+		"reset-password-mfa-webauthn-platform-challenge",
+		"reset-password-mfa-webauthn-roaming-challenge",
+	},
 }
 
 type partialsData map[string]*management.PromptScreenPartials