diff --git a/internal/cli/universal_login_customize_test.go b/internal/cli/universal_login_customize_test.go
index 703f717e..42955651 100644
--- a/internal/cli/universal_login_customize_test.go
+++ b/internal/cli/universal_login_customize_test.go
@@ -383,42 +383,53 @@ func TestFetchUniversalLoginBrandingData(t *testing.T) {
 						Prompt:   "login",
 						CustomText: map[string]interface{}{
 							"login": map[string]interface{}{
-								"alertListTitle":                "Alerts",
-								"auth0-users-validation":        "Something went wrong, please try again later",
-								"authentication-failure":        "We are sorry, something went wrong when attempting to login",
-								"buttonText":                    "Continue",
-								"custom-script-error-code":      "Something went wrong, please try again later.",
-								"description":                   "Log in to ${companyName} to continue to ${clientName}.",
-								"editEmailText":                 "Edit",
-								"emailPlaceholder":              "Email address",
-								"federatedConnectionButtonText": "Continue with ${connectionName}",
-								"footerLinkText":                "Sign up",
-								"footerText":                    "Don't have an account?",
-								"forgotPasswordText":            "Forgot password?",
-								"hidePasswordText":              "Hide password",
-								"invalid-connection":            "Invalid connection",
-								"invalid-email-format":          "Email is not valid.",
-								"invitationDescription":         "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
-								"invitationTitle":               "You've Been Invited!",
-								"ip-blocked":                    "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
-								"logoAltText":                   "${companyName}",
-								"no-db-connection":              "Invalid connection",
-								"no-email":                      "Please enter an email address",
-								"no-password":                   "Password is required",
-								"no-username":                   "Username is required",
-								"pageTitle":                     "Log in | ${clientName}",
-								"password-breached":             "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
-								"passwordPlaceholder":           "Password",
-								"same-user-login":               "Too many login attempts for this user. Please wait, and try again later.",
-								"separatorText":                 "Or",
-								"showPasswordText":              "Show password",
-								"signupActionLinkText":          "${footerLinkText}",
-								"signupActionText":              "${footerText}",
-								"title":                         "Welcome friend, glad to have you!",
-								"user-blocked":                  "Your account has been blocked after multiple consecutive login attempts.",
-								"usernamePlaceholder":           "Username or email address",
-								"wrong-credentials":             "Wrong username or password",
-								"wrong-email-credentials":       "Wrong email or password",
+								"alertListTitle":                         "Alerts",
+								"auth0-users-validation":                 "Something went wrong, please try again later",
+								"authentication-failure":                 "We are sorry, something went wrong when attempting to log in",
+								"buttonText":                             "Continue",
+								"custom-script-error-code":               "Something went wrong, please try again later.",
+								"description":                            "Log in to ${companyName} to continue to ${clientName}.",
+								"editEmailText":                          "Edit",
+								"emailPlaceholder":                       "Email address",
+								"federatedConnectionButtonText":          "Continue with ${connectionName}",
+								"footerLinkText":                         "Sign up",
+								"footerText":                             "Don't have an account?",
+								"forgotPasswordText":                     "Forgot password?",
+								"hidePasswordText":                       "Hide password",
+								"invalid-connection":                     "Invalid connection",
+								"invitationDescription":                  "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
+								"invitationTitle":                        "You've Been Invited!",
+								"ip-blocked":                             "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
+								"logoAltText":                            "${companyName}",
+								"no-db-connection":                       "Invalid connection",
+								"no-email":                               "Please enter an email address",
+								"no-password":                            "Password is required",
+								"no-username":                            "Username is required",
+								"pageTitle":                              "Log in | ${clientName}",
+								"password-breached":                      "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
+								"passwordPlaceholder":                    "Password",
+								"phoneOrEmailPlaceholder":                "Phone number or Email address",
+								"phoneOrUsernameOrEmailPlaceholder":      "Phone or Username or Email",
+								"phoneOrUsernamePlaceholder":             "Phone Number or Username",
+								"phonePlaceholder":                       "Phone number",
+								"same-user-login":                        "Too many login attempts for this user. Please wait, and try again later.",
+								"separatorText":                          "Or",
+								"showPasswordText":                       "Show password",
+								"signupActionLinkText":                   "${footerLinkText}",
+								"signupActionText":                       "${footerText}",
+								"title":                                  "Welcome friend, glad to have you!",
+								"user-blocked":                           "Your account has been blocked after multiple consecutive login attempts.",
+								"usernamePlaceholder":                    "Username or email address",
+								"usernameOnlyPlaceholder":                "Username",
+								"usernameOrEmailPlaceholder":             "Username or Email address",
+								"wrong-credentials":                      "Wrong username or password",
+								"wrong-email-credentials":                "Wrong email or password",
+								"wrong-email-phone-credentials":          "Incorrect email address, phone number, or password. Phone numbers must include the country code.",
+								"wrong-email-phone-username-credentials": " Incorrect email address, phone number, username, or password. Phone numbers must include the country code.",
+								"wrong-email-username-credentials":       "Incorrect email address, username, or password",
+								"wrong-phone-credentials":                "Incorrect phone number or password",
+								"wrong-phone-username-credentials":       "Incorrect phone number, username or password. Phone numbers must include the country code.",
+								"wrong-username-credentials":             "Incorrect username or password",
 							},
 						},
 					},
@@ -590,42 +601,53 @@ func TestFetchUniversalLoginBrandingData(t *testing.T) {
 						Prompt:   "login",
 						CustomText: map[string]interface{}{
 							"login": map[string]interface{}{
-								"alertListTitle":                "Alerts",
-								"auth0-users-validation":        "Something went wrong, please try again later",
-								"authentication-failure":        "We are sorry, something went wrong when attempting to login",
-								"buttonText":                    "Continue",
-								"custom-script-error-code":      "Something went wrong, please try again later.",
-								"description":                   "Log in to ${companyName} to continue to ${clientName}.",
-								"editEmailText":                 "Edit",
-								"emailPlaceholder":              "Email address",
-								"federatedConnectionButtonText": "Continue with ${connectionName}",
-								"footerLinkText":                "Sign up",
-								"footerText":                    "Don't have an account?",
-								"forgotPasswordText":            "Forgot password?",
-								"hidePasswordText":              "Hide password",
-								"invalid-connection":            "Invalid connection",
-								"invalid-email-format":          "Email is not valid.",
-								"invitationDescription":         "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
-								"invitationTitle":               "You've Been Invited!",
-								"ip-blocked":                    "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
-								"logoAltText":                   "${companyName}",
-								"no-db-connection":              "Invalid connection",
-								"no-email":                      "Please enter an email address",
-								"no-password":                   "Password is required",
-								"no-username":                   "Username is required",
-								"pageTitle":                     "Log in | ${clientName}",
-								"password-breached":             "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
-								"passwordPlaceholder":           "Password",
-								"same-user-login":               "Too many login attempts for this user. Please wait, and try again later.",
-								"separatorText":                 "Or",
-								"showPasswordText":              "Show password",
-								"signupActionLinkText":          "${footerLinkText}",
-								"signupActionText":              "${footerText}",
-								"title":                         "Welcome friend, glad to have you!",
-								"user-blocked":                  "Your account has been blocked after multiple consecutive login attempts.",
-								"usernamePlaceholder":           "Username or email address",
-								"wrong-credentials":             "Wrong username or password",
-								"wrong-email-credentials":       "Wrong email or password",
+								"alertListTitle":                         "Alerts",
+								"auth0-users-validation":                 "Something went wrong, please try again later",
+								"authentication-failure":                 "We are sorry, something went wrong when attempting to log in",
+								"buttonText":                             "Continue",
+								"custom-script-error-code":               "Something went wrong, please try again later.",
+								"description":                            "Log in to ${companyName} to continue to ${clientName}.",
+								"editEmailText":                          "Edit",
+								"emailPlaceholder":                       "Email address",
+								"federatedConnectionButtonText":          "Continue with ${connectionName}",
+								"footerLinkText":                         "Sign up",
+								"footerText":                             "Don't have an account?",
+								"forgotPasswordText":                     "Forgot password?",
+								"hidePasswordText":                       "Hide password",
+								"invalid-connection":                     "Invalid connection",
+								"invitationDescription":                  "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
+								"invitationTitle":                        "You've Been Invited!",
+								"ip-blocked":                             "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
+								"logoAltText":                            "${companyName}",
+								"no-db-connection":                       "Invalid connection",
+								"no-email":                               "Please enter an email address",
+								"no-password":                            "Password is required",
+								"no-username":                            "Username is required",
+								"pageTitle":                              "Log in | ${clientName}",
+								"password-breached":                      "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
+								"passwordPlaceholder":                    "Password",
+								"phoneOrEmailPlaceholder":                "Phone number or Email address",
+								"phoneOrUsernameOrEmailPlaceholder":      "Phone or Username or Email",
+								"phoneOrUsernamePlaceholder":             "Phone Number or Username",
+								"phonePlaceholder":                       "Phone number",
+								"same-user-login":                        "Too many login attempts for this user. Please wait, and try again later.",
+								"separatorText":                          "Or",
+								"showPasswordText":                       "Show password",
+								"signupActionLinkText":                   "${footerLinkText}",
+								"signupActionText":                       "${footerText}",
+								"title":                                  "Welcome friend, glad to have you!",
+								"user-blocked":                           "Your account has been blocked after multiple consecutive login attempts.",
+								"usernamePlaceholder":                    "Username or email address",
+								"usernameOnlyPlaceholder":                "Username",
+								"usernameOrEmailPlaceholder":             "Username or Email address",
+								"wrong-credentials":                      "Wrong username or password",
+								"wrong-email-credentials":                "Wrong email or password",
+								"wrong-email-phone-credentials":          "Incorrect email address, phone number, or password. Phone numbers must include the country code.",
+								"wrong-email-phone-username-credentials": " Incorrect email address, phone number, username, or password. Phone numbers must include the country code.",
+								"wrong-email-username-credentials":       "Incorrect email address, username, or password",
+								"wrong-phone-credentials":                "Incorrect phone number or password",
+								"wrong-phone-username-credentials":       "Incorrect phone number, username or password. Phone numbers must include the country code.",
+								"wrong-username-credentials":             "Incorrect username or password",
 							},
 						},
 					},
@@ -799,42 +821,53 @@ func TestFetchUniversalLoginBrandingData(t *testing.T) {
 						Prompt:   "login",
 						CustomText: map[string]interface{}{
 							"login": map[string]interface{}{
-								"alertListTitle":                "Alerts",
-								"auth0-users-validation":        "Something went wrong, please try again later",
-								"authentication-failure":        "We are sorry, something went wrong when attempting to login",
-								"buttonText":                    "Continue",
-								"custom-script-error-code":      "Something went wrong, please try again later.",
-								"description":                   "Log in to ${companyName} to continue to ${clientName}.",
-								"editEmailText":                 "Edit",
-								"emailPlaceholder":              "Email address",
-								"federatedConnectionButtonText": "Continue with ${connectionName}",
-								"footerLinkText":                "Sign up",
-								"footerText":                    "Don't have an account?",
-								"forgotPasswordText":            "Forgot password?",
-								"hidePasswordText":              "Hide password",
-								"invalid-connection":            "Invalid connection",
-								"invalid-email-format":          "Email is not valid.",
-								"invitationDescription":         "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
-								"invitationTitle":               "You've Been Invited!",
-								"ip-blocked":                    "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
-								"logoAltText":                   "${companyName}",
-								"no-db-connection":              "Invalid connection",
-								"no-email":                      "Please enter an email address",
-								"no-password":                   "Password is required",
-								"no-username":                   "Username is required",
-								"pageTitle":                     "Log in | ${clientName}",
-								"password-breached":             "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
-								"passwordPlaceholder":           "Password",
-								"same-user-login":               "Too many login attempts for this user. Please wait, and try again later.",
-								"separatorText":                 "Or",
-								"showPasswordText":              "Show password",
-								"signupActionLinkText":          "${footerLinkText}",
-								"signupActionText":              "${footerText}",
-								"title":                         "Welcome friend, glad to have you!",
-								"user-blocked":                  "Your account has been blocked after multiple consecutive login attempts.",
-								"usernamePlaceholder":           "Username or email address",
-								"wrong-credentials":             "Wrong username or password",
-								"wrong-email-credentials":       "Wrong email or password",
+								"alertListTitle":                         "Alerts",
+								"auth0-users-validation":                 "Something went wrong, please try again later",
+								"authentication-failure":                 "We are sorry, something went wrong when attempting to log in",
+								"buttonText":                             "Continue",
+								"custom-script-error-code":               "Something went wrong, please try again later.",
+								"description":                            "Log in to ${companyName} to continue to ${clientName}.",
+								"editEmailText":                          "Edit",
+								"emailPlaceholder":                       "Email address",
+								"federatedConnectionButtonText":          "Continue with ${connectionName}",
+								"footerLinkText":                         "Sign up",
+								"footerText":                             "Don't have an account?",
+								"forgotPasswordText":                     "Forgot password?",
+								"hidePasswordText":                       "Hide password",
+								"invalid-connection":                     "Invalid connection",
+								"invitationDescription":                  "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
+								"invitationTitle":                        "You've Been Invited!",
+								"ip-blocked":                             "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
+								"logoAltText":                            "${companyName}",
+								"no-db-connection":                       "Invalid connection",
+								"no-email":                               "Please enter an email address",
+								"no-password":                            "Password is required",
+								"no-username":                            "Username is required",
+								"pageTitle":                              "Log in | ${clientName}",
+								"password-breached":                      "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
+								"passwordPlaceholder":                    "Password",
+								"phoneOrEmailPlaceholder":                "Phone number or Email address",
+								"phoneOrUsernameOrEmailPlaceholder":      "Phone or Username or Email",
+								"phoneOrUsernamePlaceholder":             "Phone Number or Username",
+								"phonePlaceholder":                       "Phone number",
+								"same-user-login":                        "Too many login attempts for this user. Please wait, and try again later.",
+								"separatorText":                          "Or",
+								"showPasswordText":                       "Show password",
+								"signupActionLinkText":                   "${footerLinkText}",
+								"signupActionText":                       "${footerText}",
+								"title":                                  "Welcome friend, glad to have you!",
+								"user-blocked":                           "Your account has been blocked after multiple consecutive login attempts.",
+								"usernamePlaceholder":                    "Username or email address",
+								"usernameOnlyPlaceholder":                "Username",
+								"usernameOrEmailPlaceholder":             "Username or Email address",
+								"wrong-credentials":                      "Wrong username or password",
+								"wrong-email-credentials":                "Wrong email or password",
+								"wrong-email-phone-credentials":          "Incorrect email address, phone number, or password. Phone numbers must include the country code.",
+								"wrong-email-phone-username-credentials": " Incorrect email address, phone number, username, or password. Phone numbers must include the country code.",
+								"wrong-email-username-credentials":       "Incorrect email address, username, or password",
+								"wrong-phone-credentials":                "Incorrect phone number or password",
+								"wrong-phone-username-credentials":       "Incorrect phone number, username or password. Phone numbers must include the country code.",
+								"wrong-username-credentials":             "Incorrect username or password",
 							},
 						},
 					},
@@ -1088,42 +1121,53 @@ func TestFetchUniversalLoginBrandingData(t *testing.T) {
 						Prompt:   "login",
 						CustomText: map[string]interface{}{
 							"login": map[string]interface{}{
-								"alertListTitle":                "Alerts",
-								"auth0-users-validation":        "Something went wrong, please try again later",
-								"authentication-failure":        "We are sorry, something went wrong when attempting to login",
-								"buttonText":                    "Continue",
-								"custom-script-error-code":      "Something went wrong, please try again later.",
-								"description":                   "Log in to ${companyName} to continue to ${clientName}.",
-								"editEmailText":                 "Edit",
-								"emailPlaceholder":              "Email address",
-								"federatedConnectionButtonText": "Continue with ${connectionName}",
-								"footerLinkText":                "Sign up",
-								"footerText":                    "Don't have an account?",
-								"forgotPasswordText":            "Forgot password?",
-								"hidePasswordText":              "Hide password",
-								"invalid-connection":            "Invalid connection",
-								"invalid-email-format":          "Email is not valid.",
-								"invitationDescription":         "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
-								"invitationTitle":               "You've Been Invited!",
-								"ip-blocked":                    "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
-								"logoAltText":                   "${companyName}",
-								"no-db-connection":              "Invalid connection",
-								"no-email":                      "Please enter an email address",
-								"no-password":                   "Password is required",
-								"no-username":                   "Username is required",
-								"pageTitle":                     "Log in | ${clientName}",
-								"password-breached":             "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
-								"passwordPlaceholder":           "Password",
-								"same-user-login":               "Too many login attempts for this user. Please wait, and try again later.",
-								"separatorText":                 "Or",
-								"showPasswordText":              "Show password",
-								"signupActionLinkText":          "${footerLinkText}",
-								"signupActionText":              "${footerText}",
-								"title":                         "Welcome friend, glad to have you!",
-								"user-blocked":                  "Your account has been blocked after multiple consecutive login attempts.",
-								"usernamePlaceholder":           "Username or email address",
-								"wrong-credentials":             "Wrong username or password",
-								"wrong-email-credentials":       "Wrong email or password",
+								"alertListTitle":                         "Alerts",
+								"auth0-users-validation":                 "Something went wrong, please try again later",
+								"authentication-failure":                 "We are sorry, something went wrong when attempting to log in",
+								"buttonText":                             "Continue",
+								"custom-script-error-code":               "Something went wrong, please try again later.",
+								"description":                            "Log in to ${companyName} to continue to ${clientName}.",
+								"editEmailText":                          "Edit",
+								"emailPlaceholder":                       "Email address",
+								"federatedConnectionButtonText":          "Continue with ${connectionName}",
+								"footerLinkText":                         "Sign up",
+								"footerText":                             "Don't have an account?",
+								"forgotPasswordText":                     "Forgot password?",
+								"hidePasswordText":                       "Hide password",
+								"invalid-connection":                     "Invalid connection",
+								"invitationDescription":                  "Log in to accept ${inviterName}'s invitation to join ${companyName} on ${clientName}.",
+								"invitationTitle":                        "You've Been Invited!",
+								"ip-blocked":                             "We have detected suspicious login behavior and further attempts will be blocked. Please contact the administrator.",
+								"logoAltText":                            "${companyName}",
+								"no-db-connection":                       "Invalid connection",
+								"no-email":                               "Please enter an email address",
+								"no-password":                            "Password is required",
+								"no-username":                            "Username is required",
+								"pageTitle":                              "Log in | ${clientName}",
+								"password-breached":                      "We have detected a potential security issue with this account. To protect your account, we have prevented this login. Please reset your password to proceed.",
+								"passwordPlaceholder":                    "Password",
+								"phoneOrEmailPlaceholder":                "Phone number or Email address",
+								"phoneOrUsernameOrEmailPlaceholder":      "Phone or Username or Email",
+								"phoneOrUsernamePlaceholder":             "Phone Number or Username",
+								"phonePlaceholder":                       "Phone number",
+								"same-user-login":                        "Too many login attempts for this user. Please wait, and try again later.",
+								"separatorText":                          "Or",
+								"showPasswordText":                       "Show password",
+								"signupActionLinkText":                   "${footerLinkText}",
+								"signupActionText":                       "${footerText}",
+								"title":                                  "Welcome friend, glad to have you!",
+								"user-blocked":                           "Your account has been blocked after multiple consecutive login attempts.",
+								"usernamePlaceholder":                    "Username or email address",
+								"usernameOnlyPlaceholder":                "Username",
+								"usernameOrEmailPlaceholder":             "Username or Email address",
+								"wrong-credentials":                      "Wrong username or password",
+								"wrong-email-credentials":                "Wrong email or password",
+								"wrong-email-phone-credentials":          "Incorrect email address, phone number, or password. Phone numbers must include the country code.",
+								"wrong-email-phone-username-credentials": " Incorrect email address, phone number, username, or password. Phone numbers must include the country code.",
+								"wrong-email-username-credentials":       "Incorrect email address, username, or password",
+								"wrong-phone-credentials":                "Incorrect phone number or password",
+								"wrong-phone-username-credentials":       "Incorrect phone number, username or password. Phone numbers must include the country code.",
+								"wrong-username-credentials":             "Incorrect username or password",
 							},
 						},
 					},