diff --git a/js/apps/admin-ui/public/locales/en/translation.json b/js/apps/admin-ui/public/locales/en/translation.json
index a4ce685e5d..eab519da4f 100644
--- a/js/apps/admin-ui/public/locales/en/translation.json
+++ b/js/apps/admin-ui/public/locales/en/translation.json
@@ -172,6 +172,7 @@
   "missingAttributes": "No attributes have been defined yet. Click the below button to add attributes, key and value are required for a key pair.",
   "addAttribute": "Add an attribute",
   "removeAttribute": "Remove attribute",
+  "editUsernameHelp": "If enabled, the username field is editable, readonly otherwise.",
   "keyPlaceholder": "Type a key",
   "valuePlaceholder": "Type a value",
   "keyError": "A key must be provided.",
@@ -587,9 +588,13 @@
   "frontchannelUrlInvalid": "Front-channel logout URL is not a valid URL",
   "accessSettings": "Access settings",
   "rootUrl": "Root URL",
+  "rootURLHelp": "Root URL appended to relative URLs",
   "validRedirectUri": "Valid redirect URIs",
+  "validRedirectURIsHelp": "Valid URI pattern a browser can redirect to after a successful login. Simple wildcards are allowed such as 'http://example.com/*'. Relative path can be specified too such as /my/relative/path/*. Relative paths are relative to the client root URL, or if none is specified the auth server root URL is used. For SAML, you must set valid URI patterns if you are relying on the consumer service URL embedded with the login request.",
   "validPostLogoutRedirectUri": "Valid post logout redirect URIs",
+  "validPostLogoutRedirectURIsHelp": "Valid URI pattern a browser can redirect to after a successful logout. A value of '+' or an empty field will use the list of valid redirect uris. A value of '-' will not allow any post logout redirect uris. Simple wildcards are allowed such as 'http://example.com/*'. Relative path can be specified too such as /my/relative/path/*. Relative paths are relative to the client root URL, or if none is specified the auth server root URL is used.",
   "idpInitiatedSsoUrlName": "IDP-Initiated SSO URL name",
+  "unsigned": "Unsigned",
   "idpInitiatedSsoUrlNameHelp": "URL fragment name to reference client when you want to do IDP Initiated SSO. Leaving this empty will disable IDP Initiated SSO. The URL you will reference from your browser will be: {server-root}/realms/{realm}/protocol/saml/clients/{client-url-name}",
   "idpInitiatedSsoRelayState": "IDP Initiated SSO Relay State",
   "masterSamlProcessingUrl": "Master SAML Processing URL",
@@ -2141,8 +2146,13 @@
     "PUSHED_AUTHORIZATION_REQUEST_ERROR": {
       "name": "Pushed authorization request error",
       "description": "Pushed authorization request error"
+    },
+    "USER_DISABLED_BY_PERMANENT_LOCKOUT": {
+      "name": "User disabled by permanent lockout",
+      "description": "User disabled by permanent lockout"
     }
   },
+  "userEventsRegistered": "User events registered",
   "eventConfigSuccessfully": "Successfully saved configuration",
   "eventConfigError": "Could not save event configuration {{error}}",
   "deleteEvents": "Clear events",
diff --git a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
index d70b0b6a97..867cf45ba3 100644
--- a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
+++ b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
@@ -90,10 +90,7 @@ const WebauthnSelect = ({
     <FormGroup
       label={t(label)}
       labelIcon={
-        <HelpItem
-          helpText={t(`${label}Help`)}
-          fieldLabelId={`authentication:${label}`}
-        />
+        <HelpItem helpText={t(`${label}Help`)} fieldLabelId={label!} />
       }
       fieldId={name}
     >
@@ -194,7 +191,7 @@ export const WebauthnPolicy = ({
   return (
     <PageSection variant="light">
       {enabled && (
-        <Popover bodyContent={t(`authentication-help:${namePrefix}FormHelp`)}>
+        <Popover bodyContent={t(`${namePrefix}FormHelp`)}>
           <TextContent className="keycloak__section_intro__help">
             <Text>
               <QuestionCircleIcon /> {t("webauthnIntro")}
diff --git a/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx b/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
index 8862bc6dea..954a112336 100644
--- a/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
@@ -50,7 +50,7 @@ export const AddMapperForm = ({
       <FormGroup
         label={t("name")}
         labelIcon={
-          <HelpItem helpText={t("addIdpMapperName")} fieldLabelId="name" />
+          <HelpItem helpText={t("addIdpMapperNameHelp")} fieldLabelId="name" />
         }
         fieldId="kc-name"
         isRequired
diff --git a/js/apps/admin-ui/src/realm/add/NewRealmForm.tsx b/js/apps/admin-ui/src/realm/add/NewRealmForm.tsx
index 9558941aa2..04da0832c1 100644
--- a/js/apps/admin-ui/src/realm/add/NewRealmForm.tsx
+++ b/js/apps/admin-ui/src/realm/add/NewRealmForm.tsx
@@ -56,13 +56,13 @@ export default function NewRealmForm() {
       await refreshRealms();
       navigate(toDashboard({ realm: fields.realm }));
     } catch (error) {
-      addError("realm:saveRealmError", error);
+      addError("saveRealmError", error);
     }
   };
 
   return (
     <>
-      <ViewHeader titleKey="realm:createRealm" subKey="realm:realmExplain" />
+      <ViewHeader titleKey="createRealm" subKey="realmExplain" />
       <PageSection variant="light">
         <FormAccess
           isHorizontal