diff --git a/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_de.properties b/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_de.properties
index 7721290988..6442e6e05a 100644
--- a/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_de.properties
+++ b/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_de.properties
@@ -5,6 +5,8 @@ save=de Save
cancel=de Cancel
onText=AN
offText=AUS
+client=de Client
+clear=de Clear
# Realm settings
realm-detail.enabled.tooltip=de Users and clients can only access a realm if it's enabled
@@ -25,3 +27,90 @@ sslRequired.option.all=de all requests
sslRequired.option.external=de external requests
sslRequired.option.none=de none
sslRequired.tooltip=de Is HTTPS required? 'None' means HTTPS is not required for any client IP address. 'External requests' means localhost and private IP addresses can access without HTTPS. 'All requests' means HTTPS is required for all IP addresses.
+publicKey=de Public key
+gen-new-keys=de Generate new keys
+certificate=de Certificate
+host=de Host
+smtp-host=de SMTP Host
+port=de Port
+smtp-port=de SMTP Port (defaults to 25)
+from=de From
+sender-email-addr=de Sender Email Address
+enable-ssl=de Enable SSL
+enable-start-tls=de Enable StartTLS
+enable-auth=de Enable Authentication
+username=de Username
+login-username=de Login Username
+password=de Password
+login-password=de Login Password
+login-theme=de Login Theme
+select-one=de Select one...
+login-theme.tooltip=de Select theme for login, TOTP, grant, registration, and forgot password pages.
+account-theme=de Account Theme
+account-theme.tooltip=de Select theme for user account management pages.
+admin-console-theme=de Admin Console Theme
+select-theme-admin-console=de Select theme for admin console.
+email-theme=de Email Theme
+select-theme-email=de Select theme for emails that are sent by the server.
+i18n-enabled=de Internationalization Enabled
+supported-locales=de Supported Locales
+supported-locales.placeholder=de Type a locale and enter
+default-locale=de Default Locale
+realm-cache-enabled=de Realm Cache Enabled
+realm-cache-enabled.tooltip=de Enable/disable cache for realm, client and role data.
+user-cache-enabled=de User Cache Enabled
+user-cache-enabled.tooltip=de Enable/disable user and user role mapping cache.
+sso-session-idle=de SSO Session Idle
+seconds=de Seconds
+minutes=de Minutes
+hours=de Hours
+days=de Days
+sso-session-max=de SSO Session Max
+sso-session-idle.tooltip=de Time a session is allowed to be idle before it expires. Tokens and browser sessions are invalidated when a session is expired.
+sso-session-max.tooltip=de Max time before a session is expired. Tokens and browser sessions are invalidated when a session is expired.
+access-token-lifespan=de Access Token Lifespan
+access-token-lifespan.tooltip=de Max time before an access token is expired. This value is recommended to be short relative to the SSO timeout.
+client-login-timeout=de Client login timeout
+client-login-timeout.tooltip=de Max time an client has to finish the access token protocol. This should normally be 1 minute.
+login-timeout=de Login timeout
+login-timeout.tooltip=de Max time a user has to complete a login. This is recommended to be relatively long. 30 minutes or more.
+login-action-timeout=de Login action timeout
+login-action-timeout.tooltip=de Max time a user has to complete login related actions like update password or configure totp. This is recommended to be relatively long. 5 minutes or more.
+headers=de Headers
+brute-force-detection=de Brute Force Detection
+x-frame-options=de X-Frame-Options
+click-label-for-info=de Click on label link for more information. The default value prevents pages from being included via non-origin iframes.
+content-sec-policy=de Content-Security-Policy
+max-login-failures=de Max Login Failures
+max-login-failures.tooltip=de How many failures before wait is triggered.
+wait-increment=de Wait Increment
+wait-increment.tooltip=de When failure threshold has been met, how much time should the user be locked out?
+quick-login-check-millis=de Quick Login Check Milli Seconds
+quick-login-check-millis.tooltip=de If a failure happens concurrently too quickly, lock out the user.
+min-quick-login-wait=de Minimum Quick Login Wait
+min-quick-login-wait.tooltip=de How long to wait after a quick login failure.
+max-wait=de Max Wait
+max-wait.tooltip=de Max time a user will be locked out.
+failure-reset-time=de Failure Reset Time
+failure-reset-time.tooltip=de When will failure count be reset?
+realm-tab-login=de Login
+realm-tab-keys=de Keys
+realm-tab-email=de Email
+realm-tab-themes=de Themes
+realm-tab-cache=de Cache
+realm-tab-tokens=de Tokens
+realm-tab-security-defenses=de Security Defenses
+realm-tab-general=de General
+add-realm=de Add Realm
+
+#Session settings
+realm-sessions=de Realm Sessions
+revocation=de Revocation
+logout-all=de Logout All
+active-sessions=de Active Sessions
+sessions=de Sessions
+not-before=de Not Before
+not-before.tooltip=de Revoke any tokens issued before this date.
+set-to-now=de Set To Now
+push=de Push
+push.tooltip=de For every client that has an admin URL, notify them of the new revocation policy.
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index bb66578f72..be3ef2de22 100644
--- a/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/forms/common-themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -5,6 +5,8 @@ save=Save
cancel=Cancel
onText=ON
offText=OFF
+client=Client
+clear=Clear
# Realm settings
realm-detail.enabled.tooltip=Users and clients can only access a realm if it's enabled
@@ -25,3 +27,90 @@ sslRequired.option.all=all requests
sslRequired.option.external=external requests
sslRequired.option.none=none
sslRequired.tooltip=Is HTTPS required? 'None' means HTTPS is not required for any client IP address. 'External requests' means localhost and private IP addresses can access without HTTPS. 'All requests' means HTTPS is required for all IP addresses.
+publicKey=Public key
+gen-new-keys=Generate new keys
+certificate=Certificate
+host=Host
+smtp-host=SMTP Host
+port=Port
+smtp-port=SMTP Port (defaults to 25)
+from=From
+sender-email-addr=Sender Email Address
+enable-ssl=Enable SSL
+enable-start-tls=Enable StartTLS
+enable-auth=Enable Authentication
+username=Username
+login-username=Login Username
+password=Password
+login-password=Login Password
+login-theme=Login Theme
+select-one=Select one...
+login-theme.tooltip=Select theme for login, TOTP, grant, registration, and forgot password pages.
+account-theme=Account Theme
+account-theme.tooltip=Select theme for user account management pages.
+admin-console-theme=Admin Console Theme
+select-theme-admin-console=Select theme for admin console.
+email-theme=Email Theme
+select-theme-email=Select theme for emails that are sent by the server.
+i18n-enabled=Internationalization Enabled
+supported-locales=Supported Locales
+supported-locales.placeholder=Type a locale and enter
+default-locale=Default Locale
+realm-cache-enabled=Realm Cache Enabled
+realm-cache-enabled.tooltip=Enable/disable cache for realm, client and role data.
+user-cache-enabled=User Cache Enabled
+user-cache-enabled.tooltip=Enable/disable user and user role mapping cache.
+sso-session-idle=SSO Session Idle
+seconds=Seconds
+minutes=Minutes
+hours=Hours
+days=Days
+sso-session-max=SSO Session Max
+sso-session-idle.tooltip=Time a session is allowed to be idle before it expires. Tokens and browser sessions are invalidated when a session is expired.
+sso-session-max.tooltip=Max time before a session is expired. Tokens and browser sessions are invalidated when a session is expired.
+access-token-lifespan=Access Token Lifespan
+access-token-lifespan.tooltip=Max time before an access token is expired. This value is recommended to be short relative to the SSO timeout.
+client-login-timeout=Client login timeout
+client-login-timeout.tooltip=Max time an client has to finish the access token protocol. This should normally be 1 minute.
+login-timeout=Login timeout
+login-timeout.tooltip=Max time a user has to complete a login. This is recommended to be relatively long. 30 minutes or more.
+login-action-timeout=Login action timeout
+login-action-timeout.tooltip=Max time a user has to complete login related actions like update password or configure totp. This is recommended to be relatively long. 5 minutes or more.
+headers=Headers
+brute-force-detection=Brute Force Detection
+x-frame-options=X-Frame-Options
+click-label-for-info=Click on label link for more information. The default value prevents pages from being included via non-origin iframes.
+content-sec-policy=Content-Security-Policy
+max-login-failures=Max Login Failures
+max-login-failures.tooltip=How many failures before wait is triggered.
+wait-increment=Wait Increment
+wait-increment.tooltip=When failure threshold has been met, how much time should the user be locked out?
+quick-login-check-millis=Quick Login Check Milli Seconds
+quick-login-check-millis.tooltip=If a failure happens concurrently too quickly, lock out the user.
+min-quick-login-wait=Minimum Quick Login Wait
+min-quick-login-wait.tooltip=How long to wait after a quick login failure.
+max-wait=Max Wait
+max-wait.tooltip=Max time a user will be locked out.
+failure-reset-time=Failure Reset Time
+failure-reset-time.tooltip=When will failure count be reset?
+realm-tab-login=Login
+realm-tab-keys=Keys
+realm-tab-email=Email
+realm-tab-themes=Themes
+realm-tab-cache=Cache
+realm-tab-tokens=Tokens
+realm-tab-security-defenses=Security Defenses
+realm-tab-general=General
+add-realm=Add Realm
+
+#Session settings
+realm-sessions=Realm Sessions
+revocation=Revocation
+logout-all=Logout All
+active-sessions=Active Sessions
+sessions=Sessions
+not-before=Not Before
+not-before.tooltip=Revoke any tokens issued before this date.
+set-to-now=Set To Now
+push=Push
+push.tooltip=For every client that has an admin URL, notify them of the new revocation policy.
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html
index e26e126c70..33845c0b40 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html
@@ -2,102 +2,102 @@