diff --git a/js/apps/admin-ui/public/locales/en/translation.json b/js/apps/admin-ui/public/locales/en/translation.json
index 02f507f24e..8180bccec8 100644
--- a/js/apps/admin-ui/public/locales/en/translation.json
+++ b/js/apps/admin-ui/public/locales/en/translation.json
@@ -819,12 +819,12 @@
   "clientSignatureHelp": "Will the client sign their saml requests and responses? And should they be validated?",
   "downloadType": "this is information about the download type",
   "detailsHelp": "this is information about the details",
-  "clientPolicyName": "Display name of the policy",
+  "clientPolicyNameHelp": "Display name of the policy",
   "createTokenHelp": "An initial access token can only be used to create clients",
   "expirationHelp": "Sets the expiration for events. Expired events are periodically deleted from the database.",
   "countHelp": "Specifies how many clients can be created using the token",
-  "client-authenticator-type": "Client Authenticator used for authentication of this client against Keycloak server",
-  "registration-access-token": "The registration access token provides access for clients to the client registration service.",
+  "clientAuthenticatorTypeHelp": "Client Authenticator used for authentication of this client against Keycloak server",
+  "registrationAccessTokenHelp": "The registration access token provides access for clients to the client registration service.",
   "signature-algorithm": "JWA algorithm, which the client needs to use when signing a JWT for authentication. If left blank, the client is allowed to use any appropriate algorithm for the particular client authenticator.",
   "anonymousAccessPoliciesHelp": "Those Policies are used when the Client Registration Service is invoked by unauthenticated request. This means that the request does not contain Initial Access Token nor Bearer Token.",
   "authenticatedAccessPoliciesHelp": "Those Policies are used when Client Registration Service is invoked by authenticated request. This means that the request contains Initial Access Token or Bearer Token.",
@@ -917,7 +917,7 @@
   "policyEnforcementModeHelp": "The policy enforcement mode dictates how policies are enforced when evaluating authorization requests. 'Enforcing' means requests are denied by default even when there is no policy associated with a given resource. 'Permissive' means requests are allowed even when there is no policy associated with a given resource. 'Disabled' completely disables the evaluation of policies and allows access to any resource.",
   "decisionStrategyHelp": "The decision strategy dictates how permissions are evaluated and how a final decision is obtained. 'Affirmative' means that at least one permission must evaluate to a positive decision in order to grant access to a resource and its scopes. 'Unanimous' means that all permissions must evaluate to a positive decision in order for the final decision to be also positive.",
   "allowRemoteResourceManagementHelp": "Should resources be managed remotely by the resource server? If false, resources can be managed only from this Admin UI.",
-  "resourceName": "A unique name for this resource. The name can be used to uniquely identify a resource, useful when querying for a specific resource.",
+  "resourceNameHelp": "A unique name for this resource. The name can be used to uniquely identify a resource, useful when querying for a specific resource.",
   "displayNameHelp": "Friendly name for Identity Providers.",
   "typeHelp": "Client scopes, which will be added as default scopes to each created client",
   "urisHelp": "Set of URIs which are protected by resource.",
@@ -930,12 +930,12 @@
   "resetActions": "Reset Actions",
   "lifespan": "Expires In",
   "scopeName": "A unique name for this scope. The name can be used to uniquely identify a scope, useful when querying for a specific scope.",
-  "scopeDisplayName": "A unique name for this scope. The name can be used to uniquely identify a scope, useful when querying for a specific scope.",
+  "scopeDisplayNameHelp": "A unique name for this scope. The name can be used to uniquely identify a scope, useful when querying for a specific scope.",
   "policy-name": "The name of this policy.",
   "policy-description": "A description for this policy.",
   "policyDecisionStagey": "The decision strategy dictates how the policies associated with a given permission are evaluated and how a final decision is obtained. 'Affirmative' means that at least one policy must evaluate to a positive decision in order for the final decision to be also positive. 'Unanimous' means that all policies must evaluate to a positive decision in order for the final decision to be also positive. 'Consensus' means that the number of positive decisions must be greater than the number of negative decisions. If the number of positive and negative is the same, the final decision will be negative.",
   "applyPolicyHelp": "Specifies all the policies that must be applied to the scopes defined by this policy or permission.",
-  "policyClient": "Specifies which client(s) are allowed by this policy.",
+  "policyClientHelp": "Specifies which client(s) are allowed by this policy.",
   "groupsClaimHelp": "If defined, the policy will fetch user's groups from the given claim within an access token or ID token representing the identity asking permissions. If not defined, user's groups are obtained from your realm configuration.",
   "policyGroups": "Specifies which user(s) are allowed by this policy.",
   "targetClaimHelp": "Specifies the target claim which the policy will fetch.",
@@ -947,16 +947,16 @@
   "dayMonthHelp": "Defines the day of month when the policy MUST be granted. You can also provide a range by filling the second field. In this case, permission is granted only if current day of month is between or equal to the two values you provided.",
   "hourHelp": "Defines the hour when the policy MUST be granted. You can also provide a range by filling the second field. In this case, permission is granted only if current hour is between or equal to the two values you provided.",
   "minuteHelp": "Defines the minute when the policy MUST be granted. You can also provide a range by filling the second field. In this case, permission is granted only if current minute is between or equal to the two values you provided.",
-  "policyCode": "The JavaScript code providing the conditions for this policy.",
+  "policyCodeHelp": "The JavaScript code providing the conditions for this policy.",
   "logicHelp": "The logic dictates how the policy decision should be made. If 'Positive', the resulting effect (permit or deny) obtained during the evaluation of this policy will be used to perform a decision. If 'Negative', the resulting effect will be negated, in other words, a permit becomes a deny and vice-versa.",
   "permissionName": "The name of this permission.",
   "permissionDescription": "A description for this permission.",
   "applyToResourceTypeFlagHelp": "Specifies if this permission should be applied to all resources with a given type. In this case, this permission will be evaluated for all instances of a given resource type.",
   "permissionResources": "Specifies that this permission must be applied to a specific resource instance.",
-  "permissionScopes": "Specifies that this permission must be applied to one or more scopes.",
-  "permissionPolicies": "Specifies all the policies that must be applied to the scopes defined by this policy or permission.",
+  "permissionScopesHelp": "Specifies that this permission must be applied to one or more scopes.",
+  "permissionPoliciesHelp": "Specifies all the policies that must be applied to the scopes defined by this policy or permission.",
   "permissionType": "Specifies that this permission must be applied to all resources instances of a given type.",
-  "permissionDecisionStrategy": "The decision strategy dictates how the policies associated with a given permission are evaluated and how a final decision is obtained. 'Affirmative' means that at least one policy must evaluate to a positive decision in order for the final decision to be also positive. 'Unanimous' means that all policies must evaluate to a positive decision in order for the final decision to be also positive. 'Consensus' means that the number of positive decisions must be greater than the number of negative decisions. If the number of positive and negative is the same, the final decision will be negative.",
+  "permissionDecisionStrategyHelp": "The decision strategy dictates how the policies associated with a given permission are evaluated and how a final decision is obtained. 'Affirmative' means that at least one policy must evaluate to a positive decision in order for the final decision to be also positive. 'Unanimous' means that all policies must evaluate to a positive decision in order for the final decision to be also positive. 'Consensus' means that the number of positive decisions must be greater than the number of negative decisions. If the number of positive and negative is the same, the final decision will be negative.",
   "permissionsEnabledHelp": "Determines if fine grained permissions are enabled for managing this role.  Disabling will delete all current permissions that have been set up.",
   "createClientScope": "Create client scope",
   "clientScopeList": "Client scopes",
@@ -1012,7 +1012,7 @@
   },
   "claimJsonType": "JSON type that should be used to populate the json claim in the token. long, int, boolean, String and JSON are valid values.",
   "protocolMapper": "Protocol...",
-  "mapperName": "Name of the mapper",
+  "mapperNameHelp": "Name of the mapper",
   "roleHelp": "Role to grant to user if all attributes are present. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference a client role the syntax is clientname.clientrole, i.e. myclient.myrole",
   "newRoleNameHelp": "The new role name.  The new name format corresponds to where in the access token the role will be mapped to.  So, a new name of 'myapp.newname' will map the role to that position in the access token.  A new name of 'newname' will map the role to the realm roles in the token.",
   "rolesScope": "If there is no role scope mapping defined, each user is permitted to use this client scope. If there are role scope mappings defined, the user must be a member of at least one of the roles.",
@@ -1366,11 +1366,11 @@
   "deleteSuccess": "Attributes group deleted.",
   "deleteAttributeGroupError": "Could not delete user attributes group: {{error}}",
   "nameField": "Name",
-  "nameHint": "A unique name for the group. This name will be used to reference the group when binding an attribute to a group.",
+  "nameHintHelp": "A unique name for the group. This name will be used to reference the group when binding an attribute to a group.",
   "displayHeaderField": "Display name",
-  "displayHeaderHint": "A user-friendly name for the group that should be used when rendering a group of attributes in user-facing forms. Supports keys for localized values as well. For example: ${profile.attribute.group.address}.",
+  "displayHeaderHintHelp": "A user-friendly name for the group that should be used when rendering a group of attributes in user-facing forms. Supports keys for localized values as well. For example: ${profile.attribute.group.address}.",
   "displayDescriptionField": "Display description",
-  "displayDescriptionHint": "A text that should be used as a tooltip when rendering user-facing forms.",
+  "displayDescriptionHintHelp": "A text that should be used as a tooltip when rendering user-facing forms.",
   "annotationsText": "Annotations",
   "inputType": "Input type",
   "inputHelperTextBefore": "Helper text (above) the input field",
@@ -1408,7 +1408,7 @@
   "login": "Login",
   "themes": "Themes",
   "eventListeners": "Event listeners",
-  "eventListenersHelpText": "Configure what listeners receive events for the realm.",
+  "eventListenersHelpTextHelp": "Configure what listeners receive events for the realm.",
   "saveEventListeners": "Save Event Listeners",
   "saveEventListenersSuccess": "Event listener has been updated.",
   "saveEventListenersError": "Error saving event listener: {{error}}",
@@ -1482,6 +1482,7 @@
   "verifyEmailHelpText": "Require user to verify their email address after initial login or after address changes are submitted.",
   "userInfoSettings": "User info settings",
   "editUsernameAllowed": "Edit username",
+  "editUSernameHelp": "If enabled, the username is editable, otherwise it is read-only.",
   "enableSwitchSuccess": "{{switch}} changed successfully",
   "enableSwitchError": "Could not enable / disable due to {{error}}",
   "testingConnection": "Testing connection",
@@ -2275,10 +2276,10 @@
   "accessTokenLifespanImplicitFlowHelp": "Max time before an access token issued during OpenID Connect Implicit Flow is expired. This value is recommended to be shorter than the SSO timeout. There is no possibility to refresh token during implicit flow, that's why there is a separate timeout different to 'Access Token Lifespan'",
   "clientLoginTimeoutHelp": "Max time a client has to finish the access token protocol. This should normally be 1 minute.",
   "userInitiatedActionLifespanHelp": "Maximum time before an action permit sent by a user (such as a forgot password e-mail) is expired. This value is recommended to be short because it's expected that the user would react to self-created action quickly.",
-  "defaultAdminInitiatedActionLifespan": "Maximum time before an action permit sent to a user by administrator is expired. This value is recommended to be long to allow administrators to send e-mails for users that are currently offline. The default timeout can be overridden immediately before issuing the token.",
+  "defaultAdminInitiatedActionLifespanHelp": "Maximum time before an action permit sent to a user by administrator is expired. This value is recommended to be long to allow administrators to send e-mails for users that are currently offline. The default timeout can be overridden immediately before issuing the token.",
   "oAuthDeviceCodeLifespanHelp": "Max time before the device code and user code are expired. This value needs to be a long enough lifetime to be usable (allowing the user to retrieve their secondary device, navigate to the verification URI, login, etc.), but should be sufficiently short to limit the usability of a code obtained for phishing.",
   "oAuthDevicePollingIntervalHelp": "The minimum amount of time in seconds that the client should wait between polling requests to the token endpoint.",
-  "shortVerificationUriTooltip": "If set, this value will be return as verification_uri in Device Authorization flow. This uri need to redirect to {server-root}/realms/{realm}/device",
+  "shortVerificationUriTooltipHelp": "If set, this value will be return as verification_uri in Device Authorization flow. This uri need to redirect to {server-root}/realms/{realm}/device",
   "overrideActionTokensHelp": "Override default settings of maximum time before an action permit sent by a user (such as a forgot password e-mail) is expired for specific action. This value is recommended to be short because it's expected that the user would react to self-created action quickly.",
   "internationalizationHelp": "If enabled, you can choose which locales you support for this realm and which locale is the default.",
   "supportedLocalesHelp": "The locales to support for this realm. The user chooses one of these locales on the login screen.",
@@ -2470,7 +2471,7 @@
   "updatedRequiredActionError": "Could not update required action: {{error}}",
   "createFlowHelp": "You can create a top level flow within this from",
   "flowTypeHelp": "What kind of form is it",
-  "topLevelFlowType": "What kind of top level flow is it? Type 'client' is used for authentication of clients (applications) when generic is for users and everything else",
+  "topLevelFlowTypeHelp": "What kind of top level flow is it? Type 'client' is used for authentication of clients (applications) when generic is for users and everything else",
   "addExecutionHelp": "Execution can have a wide range of actions, from sending a reset email to validating an OTP",
   "addSubFlowHelp": "Sub-Flows can be either generic or form. The form type is used to construct a sub-flow that generates a single flow for the user. Sub-flows are a special type of execution that evaluate as successful depending on how the executions they contain evaluate.",
   "aliasHelp": "The alias uniquely identifies an identity provider and it is also used to build the redirect uri.",
@@ -2495,7 +2496,7 @@
   "webAuthnPolicyCreateTimeoutHelp": "Timeout value for creating user's public key credential in seconds. if set to 0, this timeout option is not adapted.",
   "webAuthnPolicyAvoidSameAuthenticatorRegisterHelp": "Avoid registering the authenticator that has already been registered.",
   "webAuthnPolicyAcceptableAaguidsHelp": "The list of AAGUID of which an authenticator can be registered.",
-  "passwordPolicies": {
+  "passwordPoliciesHelp": {
     "forceExpiredPasswordChange": "The number of days the password is valid before a new password is required.",
     "hashIterations": "The number of times a password is hashed before storage or verification. Default: 27,500.",
     "passwordHistory": "Prevents a recently used password from being reused.",
@@ -3217,6 +3218,7 @@
   "createUserProviderError": "User federation provider could not be created: {{error}}",
   "flowNameHelp": "Help text for the name of the new flow",
   "flowDescriptionHelp": "Help text for the description of the new flow",
+  "flowNameDescriptionHelp": "Help text for the name description of the new flow",
   "noRoles-clientScopes": "No roles for this client scope",
   "noRolesInstructions-clientScopes": "You haven't created any roles for this client scope. Create a role to get started.",
   "noRoles-user": "No roles for this user",
diff --git a/js/apps/admin-ui/src/authentication/components/modals/AddSubFlowModal.tsx b/js/apps/admin-ui/src/authentication/components/modals/AddSubFlowModal.tsx
index a8ba3ecb62..3716f186fe 100644
--- a/js/apps/admin-ui/src/authentication/components/modals/AddSubFlowModal.tsx
+++ b/js/apps/admin-ui/src/authentication/components/modals/AddSubFlowModal.tsx
@@ -117,7 +117,7 @@ export const AddSubFlowModal = ({
           fieldId="description"
           labelIcon={
             <HelpItem
-              helpText={t("flowNameDescription")}
+              helpText={t("flowNameDescriptionHelp")}
               fieldLabelId="description"
             />
           }
diff --git a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
index d26302a99a..2b429d46fc 100644
--- a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
+++ b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
@@ -44,7 +44,7 @@ export const PolicyRow = ({
       }
       labelIcon={
         <HelpItem
-          helpText={t(`authentication-help:passwordPolicies.${id}`)}
+          helpText={t(`passwordPoliciesHelp.${id}`)}
           fieldLabelId={`authentication:${id}`}
         />
       }
diff --git a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
index 99174c8df4..145ff0dfc2 100644
--- a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
+++ b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx
@@ -91,7 +91,7 @@ const WebauthnSelect = ({
       label={t(label)}
       labelIcon={
         <HelpItem
-          helpText={t(`authentication-help:${label}`)}
+          helpText={t(`${label}Help`)}
           fieldLabelId={`authentication:${label}`}
         />
       }
diff --git a/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx b/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx
index abd07813a6..7102883422 100644
--- a/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx
+++ b/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx
@@ -217,7 +217,7 @@ export default function MappingDetails() {
           <FormGroup
             label={t("name")}
             labelIcon={
-              <HelpItem helpText={t("mapperName")} fieldLabelId="name" />
+              <HelpItem helpText={t("mapperNameHelp")} fieldLabelId="name" />
             }
             fieldId="name"
             isRequired
diff --git a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
index 7ef18d224c..415297082a 100644
--- a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
+++ b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
@@ -29,7 +29,7 @@ export const Toggle = ({ name, label }: ToggleProps) => {
       fieldId={label}
       labelIcon={
         <HelpItem
-          helpText={t(`clients-help:${label}`)}
+          helpText={t(`${label}Help`)}
           fieldLabelId={`clients:${label}`}
         />
       }
diff --git a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
index 7de4b8055f..3995f2d982 100644
--- a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
+++ b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
@@ -50,10 +50,7 @@ export const TokenLifespan = ({
       label={t(id)}
       fieldId={id}
       labelIcon={
-        <HelpItem
-          helpText={t(`clients-help:${id}`)}
-          fieldLabelId={`clients:${id}`}
-        />
+        <HelpItem helpText={t(`${id}Help`)} fieldLabelId={`clients:${id}`} />
       }
     >
       <Controller
diff --git a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
index f581a0a05e..de299650d5 100644
--- a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
@@ -321,7 +321,7 @@ export default function PermissionDetails() {
                 fieldId="scopes"
                 labelIcon={
                   <HelpItem
-                    helpText={t("permissionScopes")}
+                    helpText={t("permissionScopesHelp")}
                     fieldLabelId="scopesSelect"
                   />
                 }
@@ -341,7 +341,7 @@ export default function PermissionDetails() {
               fieldId="policies"
               labelIcon={
                 <HelpItem
-                  helpText={t("permissionPolicies")}
+                  helpText={t("permissionPoliciesHelp")}
                   fieldLabelId="policies"
                 />
               }
@@ -356,7 +356,7 @@ export default function PermissionDetails() {
               label={t("decisionStrategy")}
               labelIcon={
                 <HelpItem
-                  helpText={t("permissionDecisionStrategy")}
+                  helpText={t("permissionDecisionStrategyHelp")}
                   fieldLabelId="decisionStrategy"
                 />
               }
diff --git a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
index 59bb9ed1a3..7b6355a63b 100644
--- a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
@@ -207,7 +207,10 @@ export default function ResourceDetails() {
               label={t("name")}
               fieldId="name"
               labelIcon={
-                <HelpItem helpText={t("resourceName")} fieldLabelId="name" />
+                <HelpItem
+                  helpText={t("resourceNameHelp")}
+                  fieldLabelId="name"
+                />
               }
               helperTextInvalid={t("required")}
               validated={
diff --git a/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx b/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx
index e6cbb04633..72a0b98c43 100644
--- a/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx
@@ -132,7 +132,7 @@ export default function ScopeDetails() {
             label={t("name")}
             fieldId="name"
             labelIcon={
-              <HelpItem helpText={t("scopeName")} fieldLabelId="name" />
+              <HelpItem helpText={t("scopeNameHelp")} fieldLabelId="name" />
             }
             helperTextInvalid={t("required")}
             validated={
@@ -154,7 +154,7 @@ export default function ScopeDetails() {
             fieldId="displayName"
             labelIcon={
               <HelpItem
-                helpText={t("scopeDisplayName")}
+                helpText={t("scopeDisplayNameHelp")}
                 fieldLabelId="displayName"
               />
             }
diff --git a/js/apps/admin-ui/src/clients/authorization/policy/Client.tsx b/js/apps/admin-ui/src/clients/authorization/policy/Client.tsx
index d20faf2bf0..5c739eb4cf 100644
--- a/js/apps/admin-ui/src/clients/authorization/policy/Client.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/policy/Client.tsx
@@ -66,7 +66,7 @@ export const Client = () => {
     <FormGroup
       label={t("clients")}
       labelIcon={
-        <HelpItem helpText={t("policyClient")} fieldLabelId="client" />
+        <HelpItem helpText={t("policyClientHelp")} fieldLabelId="client" />
       }
       fieldId="clients"
       helperTextInvalid={t("requiredClient")}
diff --git a/js/apps/admin-ui/src/clients/authorization/policy/JavaScript.tsx b/js/apps/admin-ui/src/clients/authorization/policy/JavaScript.tsx
index e4fc7268f9..85f6c3b107 100644
--- a/js/apps/admin-ui/src/clients/authorization/policy/JavaScript.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/policy/JavaScript.tsx
@@ -12,7 +12,9 @@ export const JavaScript = () => {
   return (
     <FormGroup
       label={t("code")}
-      labelIcon={<HelpItem helpText={t("policyCode")} fieldLabelId="code" />}
+      labelIcon={
+        <HelpItem helpText={t("policyCodeHelp")} fieldLabelId="code" />
+      }
       fieldId="code"
       isRequired
     >
diff --git a/js/apps/admin-ui/src/clients/authorization/policy/NameDescription.tsx b/js/apps/admin-ui/src/clients/authorization/policy/NameDescription.tsx
index c3739cc065..9e6e50d831 100644
--- a/js/apps/admin-ui/src/clients/authorization/policy/NameDescription.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/policy/NameDescription.tsx
@@ -32,10 +32,7 @@ export const NameDescription = ({
         }
         isRequired
         labelIcon={
-          <HelpItem
-            helpText={t(`clients-help:${prefix}-name`)}
-            fieldLabelId="name"
-          />
+          <HelpItem helpText={t(`${prefix}-nameHelp`)} fieldLabelId="name" />
         }
       >
         <KeycloakTextInput
@@ -53,7 +50,7 @@ export const NameDescription = ({
         fieldId="kc-description"
         labelIcon={
           <HelpItem
-            helpText={t(`clients-help:${prefix}-description`)}
+            helpText={t(`${prefix}-descriptionHelp`)}
             fieldLabelId="description"
           />
         }
diff --git a/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx b/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
index 8566d202ca..9823fd3896 100644
--- a/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
@@ -134,7 +134,7 @@ const FromTo = ({ name, ...rest }: NumberControlProps) => {
       fieldId={name}
       labelIcon={
         <HelpItem
-          helpText={t(`clients-help:${name}`)}
+          helpText={t(`${name}Help`)}
           fieldLabelId={`clients:${name}`}
         />
       }
diff --git a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
index e2213be7f2..a77f968fa2 100644
--- a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
+++ b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
@@ -148,7 +148,7 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => {
               fieldId="kc-client-authenticator-type"
               labelIcon={
                 <HelpItem
-                  helpText={t("client-authenticator-type")}
+                  helpText={t("clientAuthenticatorTypeHelp")}
                   fieldLabelId="clientAuthenticator"
                 />
               }
@@ -220,7 +220,7 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => {
               fieldId="kc-access-token"
               labelIcon={
                 <HelpItem
-                  helpText={t("registration-access-token")}
+                  helpText={t("registrationAccessTokenHelp")}
                   fieldLabelId="registrationAccessToken"
                 />
               }
diff --git a/js/apps/admin-ui/src/clients/credentials/SignedJWT.tsx b/js/apps/admin-ui/src/clients/credentials/SignedJWT.tsx
index bc657545f1..1adcb51e17 100644
--- a/js/apps/admin-ui/src/clients/credentials/SignedJWT.tsx
+++ b/js/apps/admin-ui/src/clients/credentials/SignedJWT.tsx
@@ -34,7 +34,7 @@ export const SignedJWT = ({ clientAuthenticatorType }: SignedJWTProps) => {
       fieldId="kc-signature-algorithm"
       labelIcon={
         <HelpItem
-          helpText={t("signature-algorithm")}
+          helpText={t("signatureAlgorithmHelp")}
           fieldLabelId="signatureAlgorithm"
         />
       }
diff --git a/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx b/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
index f20f856cb7..452459d46d 100644
--- a/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
+++ b/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
@@ -92,7 +92,7 @@ const KeySection = ({
           <FormGroup
             labelIcon={
               <HelpItem
-                helpText={t(`clients-help:${key}`)}
+                helpText={t(`${key}Help`)}
                 fieldLabelId={`clients:${key}`}
               />
             }
diff --git a/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx b/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx
index ccc20205e1..2fa921e67b 100644
--- a/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx
+++ b/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx
@@ -164,7 +164,7 @@ export default function DetailProvider() {
             }
             labelIcon={
               <HelpItem
-                helpText={t("clientPolicyName")}
+                helpText={t("clientPolicyNameHelp")}
                 fieldLabelId="kc-name"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/ClientProfileForm.tsx b/js/apps/admin-ui/src/realm-settings/ClientProfileForm.tsx
index f23da6de13..7e69acdb25 100644
--- a/js/apps/admin-ui/src/realm-settings/ClientProfileForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/ClientProfileForm.tsx
@@ -293,7 +293,7 @@ export default function ClientProfileForm() {
                   <Text className="kc-executors" component={TextVariants.h1}>
                     {t("executors")}
                     <HelpItem
-                      helpText={t("realm-settings:executorsHelpText")}
+                      helpText={t("executorsHelpText")}
                       fieldLabelId="realm-settings:executors"
                     />
                   </Text>
diff --git a/js/apps/admin-ui/src/realm-settings/LoginTab.tsx b/js/apps/admin-ui/src/realm-settings/LoginTab.tsx
index 8201be926e..4baa0bd9d7 100644
--- a/js/apps/admin-ui/src/realm-settings/LoginTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/LoginTab.tsx
@@ -82,7 +82,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-forgot-pw"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:forgotPasswordHelpText")}
+                helpText={t("forgotPasswordHelpText")}
                 fieldLabelId="realm-settings:resetPasswordAllowed"
               />
             }
@@ -107,7 +107,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-remember-me"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:rememberMeHelpText")}
+                helpText={t("rememberMeHelpText")}
                 fieldLabelId="realm-settings:rememberMe"
               />
             }
@@ -135,7 +135,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-email-as-username"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:emailAsUsernameHelpText")}
+                helpText={t("emailAsUsernameHelpText")}
                 fieldLabelId="realm-settings:registrationEmailAsUsername"
               />
             }
@@ -166,7 +166,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-login-with-email"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:loginWithEmailHelpText")}
+                helpText={t("loginWithEmailHelpText")}
                 fieldLabelId="realm-settings:loginWithEmailAllowed"
               />
             }
@@ -195,7 +195,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-duplicate-emails"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:duplicateEmailsHelpText")}
+                helpText={t("duplicateEmailsHelpText")}
                 fieldLabelId="realm-settings:duplicateEmailsAllowed"
               />
             }
@@ -227,7 +227,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-verify-email"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:verifyEmailHelpText")}
+                helpText={t("verifyEmailHelpText")}
                 fieldLabelId="realm-settings:verifyEmail"
               />
             }
@@ -259,7 +259,7 @@ export const RealmSettingsLoginTab = ({
             fieldId="kc-edit-username"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:editUsername")}
+                helpText={t("editUsernameHelp")}
                 fieldLabelId="realm-settings:editUsernameAllowed"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx b/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
index c83145af58..96c787616a 100644
--- a/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
+++ b/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
@@ -188,10 +188,8 @@ export default function NewClientPolicyCondition() {
               <HelpItem
                 helpText={
                   conditionType
-                    ? `realm-settings-help:${camelCase(
-                        conditionType.replace(/-/g, " "),
-                      )}`
-                    : "realm-settings-help:conditions"
+                    ? `${camelCase(conditionType.replace(/-/g, " "))}Help`
+                    : "conditionsHelp"
                 }
                 fieldLabelId="realm-settings:conditionType"
               />
diff --git a/js/apps/admin-ui/src/realm-settings/SessionsTab.tsx b/js/apps/admin-ui/src/realm-settings/SessionsTab.tsx
index 303f72cf0c..d4b2014488 100644
--- a/js/apps/admin-ui/src/realm-settings/SessionsTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/SessionsTab.tsx
@@ -59,7 +59,7 @@ export const RealmSettingsSessionsTab = ({
             fieldId="SSOSessionIdle"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:ssoSessionIdle")}
+                helpText={t("ssoSessionIdle")}
                 fieldLabelId="realm-settings:SSOSessionIdle"
               />
             }
@@ -85,7 +85,7 @@ export const RealmSettingsSessionsTab = ({
             fieldId="SSOSessionMax"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:ssoSessionMax")}
+                helpText={t("ssoSessionMax")}
                 fieldLabelId="realm-settings:SSOSessionMax"
               />
             }
@@ -110,7 +110,7 @@ export const RealmSettingsSessionsTab = ({
             fieldId="SSOSessionIdleRememberMe"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:ssoSessionIdleRememberMe")}
+                helpText={t("ssoSessionIdleRememberMe")}
                 fieldLabelId="realm-settings:SSOSessionIdleRememberMe"
               />
             }
@@ -135,7 +135,7 @@ export const RealmSettingsSessionsTab = ({
             fieldId="SSOSessionMaxRememberMe"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:ssoSessionMaxRememberMe")}
+                helpText={t("ssoSessionMaxRememberMe")}
                 fieldLabelId="realm-settings:SSOSessionMaxRememberMe"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/TokensTab.tsx b/js/apps/admin-ui/src/realm-settings/TokensTab.tsx
index ac78a06d34..8be7c7510c 100644
--- a/js/apps/admin-ui/src/realm-settings/TokensTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/TokensTab.tsx
@@ -190,7 +190,7 @@ export const RealmSettingsTokensTab = ({
             fieldId="shortVerificationUri"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:shortVerificationUriTooltip")}
+                helpText={t("shortVerificationUriTooltipHelp")}
                 fieldLabelId="realm-settings:shortVerificationUri"
               />
             }
@@ -324,9 +324,7 @@ export const RealmSettingsTokensTab = ({
             fieldId="accessTokenLifespanImplicitFlow"
             labelIcon={
               <HelpItem
-                helpText={t(
-                  "realm-settings-help:accessTokenLifespanImplicitFlow",
-                )}
+                helpText={t("accessTokenLifespanImplicitFlow")}
                 fieldLabelId="realm-settings:accessTokenLifespanImplicitFlow"
               />
             }
@@ -442,9 +440,7 @@ export const RealmSettingsTokensTab = ({
             id="default-admin-initiated-label"
             labelIcon={
               <HelpItem
-                helpText={t(
-                  "realm-settings-help:defaultAdminInitiatedActionLifespan",
-                )}
+                helpText={t("defaultAdminInitiatedActionLifespanHelp")}
                 fieldLabelId="realm-settings:defaultAdminInitiated"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx b/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
index e49d7e559d..9484729f72 100644
--- a/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
@@ -53,7 +53,7 @@ export const EventConfigForm = ({
         fieldId={eventKey}
         labelIcon={
           <HelpItem
-            helpText={t(`realm-settings-help:save-${type}-events`)}
+            helpText={t(`save-${type}-eventsHelp`)}
             fieldLabelId="realm-settings:saveEvents"
           />
         }
@@ -160,7 +160,7 @@ export const EventConfigForm = ({
         fieldId={`clear-${type}-events`}
         labelIcon={
           <HelpItem
-            helpText={t(`realm-settings-help:${type}-clearEvents`)}
+            helpText={t(`${type}-clearEventsHelp`)}
             fieldLabelId={`realm-settings:clear-${type}-events`}
           />
         }
diff --git a/js/apps/admin-ui/src/realm-settings/event-config/EventListenersForm.tsx b/js/apps/admin-ui/src/realm-settings/event-config/EventListenersForm.tsx
index f69f868b6a..7088a0b649 100644
--- a/js/apps/admin-ui/src/realm-settings/event-config/EventListenersForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/event-config/EventListenersForm.tsx
@@ -40,7 +40,7 @@ export const EventListenersForm = ({
         fieldId={"kc-eventListeners"}
         labelIcon={
           <HelpItem
-            helpText={t("eventListenersHelpText")}
+            helpText={t("eventListenersHelpTextHelp")}
             fieldLabelId="realm-settings:eventListeners"
           />
         }
diff --git a/js/apps/admin-ui/src/realm-settings/security-defences/BruteForceDetection.tsx b/js/apps/admin-ui/src/realm-settings/security-defences/BruteForceDetection.tsx
index 0fc7a44822..b9fc263599 100644
--- a/js/apps/admin-ui/src/realm-settings/security-defences/BruteForceDetection.tsx
+++ b/js/apps/admin-ui/src/realm-settings/security-defences/BruteForceDetection.tsx
@@ -140,9 +140,7 @@ export const BruteForceDetection = ({
               label={t("quickLoginCheckMilliSeconds")}
               labelIcon={
                 <HelpItem
-                  helpText={t(
-                    "realm-settings-help:quickLoginCheckMilliSeconds",
-                  )}
+                  helpText={t("quickLoginCheckMilliSecondsHelp")}
                   fieldLabelId="realm-settings:quickLoginCheckMilliSeconds"
                 />
               }
diff --git a/js/apps/admin-ui/src/realm-settings/security-defences/HelpLinkTextInput.tsx b/js/apps/admin-ui/src/realm-settings/security-defences/HelpLinkTextInput.tsx
index 8759a85286..97e4c7ad61 100644
--- a/js/apps/admin-ui/src/realm-settings/security-defences/HelpLinkTextInput.tsx
+++ b/js/apps/admin-ui/src/realm-settings/security-defences/HelpLinkTextInput.tsx
@@ -25,7 +25,7 @@ export const HelpLinkTextInput = ({
       labelIcon={
         <HelpItem
           helpText={
-            <Trans i18nKey={`realm-settings-help:${name}`}>
+            <Trans i18nKey={`${name}Help`}>
               Default value prevents pages from being included
               <FormattedLink href={url} title={t("learnMore")} />
             </Trans>
diff --git a/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx b/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
index 09f9c83c85..be9e50282d 100644
--- a/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
+++ b/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
@@ -25,7 +25,7 @@ export const Time = ({
       fieldId={name}
       labelIcon={
         <HelpItem
-          helpText={t(`realm-settings-help:${name}`)}
+          helpText={t(`${name}Help`)}
           fieldLabelId={`realm-settings:${name}`}
         />
       }
diff --git a/js/apps/admin-ui/src/realm-settings/user-profile/AttributesGroupForm.tsx b/js/apps/admin-ui/src/realm-settings/user-profile/AttributesGroupForm.tsx
index 9b75d8ce02..42930ef8d5 100644
--- a/js/apps/admin-ui/src/realm-settings/user-profile/AttributesGroupForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/user-profile/AttributesGroupForm.tsx
@@ -124,7 +124,7 @@ export default function AttributesGroupForm() {
             validated={form.formState.errors.name ? "error" : "default"}
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:nameHint")}
+                helpText={t("nameHintHelp")}
                 fieldLabelId="realm-settings:nameField"
               />
             }
@@ -143,7 +143,7 @@ export default function AttributesGroupForm() {
             fieldId="kc-display-header"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:displayHeaderHint")}
+                helpText={t("displayHeaderHintHelp")}
                 fieldLabelId="realm-settings:displayHeaderField"
               />
             }
@@ -158,7 +158,7 @@ export default function AttributesGroupForm() {
             fieldId="kc-display-description"
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings:displayDescriptionHint")}
+                helpText={t("displayDescriptionHintHelp")}
                 fieldLabelId="realm-settings:displayDescriptionField"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributeGeneralSettings.tsx b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributeGeneralSettings.tsx
index 8b320a7d4a..2314ededfa 100644
--- a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributeGeneralSettings.tsx
+++ b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributeGeneralSettings.tsx
@@ -75,7 +75,7 @@ export const AttributeGeneralSettings = () => {
         label={t("attributeName")}
         labelIcon={
           <HelpItem
-            helpText={t("realm-settings-help:attributeNameHelp")}
+            helpText={t("attributeNameHelp")}
             fieldLabelId="realm-settings:attributeName"
           />
         }
@@ -98,7 +98,7 @@ export const AttributeGeneralSettings = () => {
         label={t("attributeDisplayName")}
         labelIcon={
           <HelpItem
-            helpText={t("realm-settings-help:attributeDisplayNameHelp")}
+            helpText={t("attributeDisplayNameHelp")}
             fieldLabelId="realm-settings:attributeDisplayName"
           />
         }
@@ -115,7 +115,7 @@ export const AttributeGeneralSettings = () => {
         label={t("attributeGroup")}
         labelIcon={
           <HelpItem
-            helpText={t("realm-setting-help:attributeGroupHelp")}
+            helpText={t("attributeGroupHelp")}
             fieldLabelId="realm-setting:attributeGroup"
           />
         }
@@ -250,7 +250,7 @@ export const AttributeGeneralSettings = () => {
             label={t("required")}
             labelIcon={
               <HelpItem
-                helpText={t("realm-settings-help:requiredHelp")}
+                helpText={t("requiredHelp")}
                 fieldLabelId="realm-settings:required"
               />
             }
diff --git a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributePermission.tsx b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributePermission.tsx
index 3dcf595904..f4732d32b9 100644
--- a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributePermission.tsx
+++ b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AttributePermission.tsx
@@ -70,7 +70,7 @@ export const AttributePermission = () => {
         label={t("whoCanEdit")}
         labelIcon={
           <HelpItem
-            helpText={t("realm-settings-help:whoCanEditHelp")}
+            helpText={t("whoCanEditHelp")}
             fieldLabelId="realm-settings:whoCanEdit"
           />
         }
@@ -83,7 +83,7 @@ export const AttributePermission = () => {
         label={t("whoCanView")}
         labelIcon={
           <HelpItem
-            helpText={t("realm-settings-help:whoCanViewHelp")}
+            helpText={t("whoCanViewHelp")}
             fieldLabelId="realm-settings:whoCanView"
           />
         }
diff --git a/js/apps/admin-ui/src/user-federation/custom/CustomProviderSettings.tsx b/js/apps/admin-ui/src/user-federation/custom/CustomProviderSettings.tsx
index 88611a55bd..8598ca6744 100644
--- a/js/apps/admin-ui/src/user-federation/custom/CustomProviderSettings.tsx
+++ b/js/apps/admin-ui/src/user-federation/custom/CustomProviderSettings.tsx
@@ -129,7 +129,7 @@ export default function CustomProviderSettings() {
             label={t("uiDisplayName")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:uiDisplayNameHelp")}
+                helpText={t("uiDisplayNameHelp")}
                 fieldLabelId="user-federation:uiDisplayName"
               />
             }
diff --git a/js/apps/admin-ui/src/user-federation/custom/SyncSettings.tsx b/js/apps/admin-ui/src/user-federation/custom/SyncSettings.tsx
index 7cd52fc88e..7d72606784 100644
--- a/js/apps/admin-ui/src/user-federation/custom/SyncSettings.tsx
+++ b/js/apps/admin-ui/src/user-federation/custom/SyncSettings.tsx
@@ -17,7 +17,7 @@ export const SyncSettings = () => {
         label={t("periodicFullSync")}
         labelIcon={
           <HelpItem
-            helpText={t("user-federation-help:periodicFullSyncHelp")}
+            helpText={t("periodicFullSyncHelp")}
             fieldLabelId="user-federation:periodicFullSync"
           />
         }
@@ -49,7 +49,7 @@ export const SyncSettings = () => {
           label={t("fullSyncPeriod")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:fullSyncPeriodHelp")}
+              helpText={t("fullSyncPeriodHelp")}
               fieldLabelId="user-federation:fullSyncPeriod"
             />
           }
@@ -69,7 +69,7 @@ export const SyncSettings = () => {
         label={t("periodicChangedUsersSync")}
         labelIcon={
           <HelpItem
-            helpText={t("user-federation-help:periodicChangedUsersSyncHelp")}
+            helpText={t("periodicChangedUsersSyncHelp")}
             fieldLabelId="user-federation:periodicChangedUsersSync"
           />
         }
@@ -100,7 +100,7 @@ export const SyncSettings = () => {
           label={t("changedUsersSyncPeriod")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:changedUsersSyncHelp")}
+              helpText={t("changedUsersSyncHelp")}
               fieldLabelId="user-federation:changedUsersSyncPeriod"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/kerberos/KerberosSettingsRequired.tsx b/js/apps/admin-ui/src/user-federation/kerberos/KerberosSettingsRequired.tsx
index a5d4943bdb..46d3fb05a9 100644
--- a/js/apps/admin-ui/src/user-federation/kerberos/KerberosSettingsRequired.tsx
+++ b/js/apps/admin-ui/src/user-federation/kerberos/KerberosSettingsRequired.tsx
@@ -62,7 +62,7 @@ export const KerberosSettingsRequired = ({
           label={t("uiDisplayName")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:uiDisplayNameHelp")}
+              helpText={t("uiDisplayNameHelp")}
               fieldLabelId="user-federation:uiDisplayName"
             />
           }
@@ -110,7 +110,7 @@ export const KerberosSettingsRequired = ({
           label={t("kerberosRealm")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:kerberosRealmHelp")}
+              helpText={t("kerberosRealmHelp")}
               fieldLabelId="user-federation:kc-kerberos-realm"
             />
           }
@@ -147,7 +147,7 @@ export const KerberosSettingsRequired = ({
           label={t("serverPrincipal")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:serverPrincipalHelp")}
+              helpText={t("serverPrincipalHelp")}
               fieldLabelId="user-federation:serverPrincipal"
             />
           }
@@ -184,7 +184,7 @@ export const KerberosSettingsRequired = ({
           label={t("keyTab")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:keyTabHelp")}
+              helpText={t("keyTabHelp")}
               fieldLabelId="user-federation:keyTab"
             />
           }
@@ -221,7 +221,7 @@ export const KerberosSettingsRequired = ({
           label={t("debug")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:debugHelp")}
+              helpText={t("debugHelp")}
               fieldLabelId="user-federation:debug"
             />
           }
@@ -251,9 +251,7 @@ export const KerberosSettingsRequired = ({
           label={t("allowPasswordAuthentication")}
           labelIcon={
             <HelpItem
-              helpText={t(
-                "user-federation-help:allowPasswordAuthenticationHelp",
-              )}
+              helpText={t("allowPasswordAuthenticationHelp")}
               fieldLabelId="user-federation:allowPasswordAuthentication"
             />
           }
@@ -283,7 +281,7 @@ export const KerberosSettingsRequired = ({
             label={t("editMode")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:editModeKerberosHelp")}
+                helpText={t("editModeKerberosHelp")}
                 fieldLabelId="user-federation:editMode"
               />
             }
@@ -323,7 +321,7 @@ export const KerberosSettingsRequired = ({
           label={t("updateFirstLogin")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:updateFirstLoginHelp")}
+              helpText={t("updateFirstLoginHelp")}
               fieldLabelId="user-federation:updateFirstLogin"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsAdvanced.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsAdvanced.tsx
index 5df5b3b148..34c9821eaf 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsAdvanced.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsAdvanced.tsx
@@ -65,7 +65,7 @@ export const LdapSettingsAdvanced = ({
           label={t("enableLdapv3Password")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:enableLdapv3PasswordHelp")}
+              helpText={t("enableLdapv3PasswordHelp")}
               fieldLabelId="user-federation:enableLdapv3Password"
             />
           }
@@ -95,7 +95,7 @@ export const LdapSettingsAdvanced = ({
           label={t("validatePasswordPolicy")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:validatePasswordPolicyHelp")}
+              helpText={t("validatePasswordPolicyHelp")}
               fieldLabelId="user-federation:validatePasswordPolicy"
             />
           }
@@ -125,7 +125,7 @@ export const LdapSettingsAdvanced = ({
           label={t("trustEmail")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:trustEmailHelp")}
+              helpText={t("trustEmailHelp")}
               fieldLabelId="user-federation:trustEmail"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsConnection.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsConnection.tsx
index afe02f639a..dd5d9c1b53 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsConnection.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsConnection.tsx
@@ -102,9 +102,7 @@ export const LdapSettingsConnection = ({
           label={t("connectionURL")}
           labelIcon={
             <HelpItem
-              helpText={t(
-                "user-federation-help:consoleDisplayConnectionUrlHelp",
-              )}
+              helpText={t("consoleDisplayConnectionUrlHelp")}
               fieldLabelId="user-federation:connectionURL"
             />
           }
@@ -141,7 +139,7 @@ export const LdapSettingsConnection = ({
           label={t("enableStartTls")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:enableStartTlsHelp")}
+              helpText={t("enableStartTlsHelp")}
               fieldLabelId="user-federation:enableStartTls"
             />
           }
@@ -171,7 +169,7 @@ export const LdapSettingsConnection = ({
           label={t("useTruststoreSpi")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:useTruststoreSpiHelp")}
+              helpText={t("useTruststoreSpiHelp")}
               fieldLabelId="user-federation:useTruststoreSpi"
             />
           }
@@ -204,7 +202,7 @@ export const LdapSettingsConnection = ({
           label={t("connectionPooling")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:connectionPoolingHelp")}
+              helpText={t("connectionPoolingHelp")}
               fieldLabelId="user-federation:connectionPooling"
             />
           }
@@ -233,7 +231,7 @@ export const LdapSettingsConnection = ({
           label={t("connectionTimeout")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:connectionTimeoutHelp")}
+              helpText={t("connectionTimeoutHelp")}
               fieldLabelId="user-federation:consoleTimeout"
             />
           }
@@ -261,7 +259,7 @@ export const LdapSettingsConnection = ({
           label={t("bindType")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:bindTypeHelp")}
+              helpText={t("bindTypeHelp")}
               fieldLabelId="user-federation:bindType"
             />
           }
@@ -301,7 +299,7 @@ export const LdapSettingsConnection = ({
               label={t("bindDn")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:bindDnHelp")}
+                  helpText={t("bindDnHelp")}
                   fieldLabelId="user-federation:bindDn"
                 />
               }
@@ -330,7 +328,7 @@ export const LdapSettingsConnection = ({
               label={t("bindCredentials")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:bindCredentialsHelp")}
+                  helpText={t("bindCredentialsHelp")}
                   fieldLabelId="user-federation:bindCredentials"
                 />
               }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsGeneral.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsGeneral.tsx
index efd8fd7033..02acc32422 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsGeneral.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsGeneral.tsx
@@ -111,7 +111,7 @@ export const LdapSettingsGeneral = ({
           label={t("uiDisplayName")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:uiDisplayNameHelp")}
+              helpText={t("uiDisplayNameHelp")}
               fieldLabelId="user-federation:uiDisplayName"
             />
           }
@@ -157,7 +157,7 @@ export const LdapSettingsGeneral = ({
           label={t("vendor")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:vendorHelp")}
+              helpText={t("vendorHelp")}
               fieldLabelId="user-federation:vendor"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
index b58926a424..a8ac7d9a21 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
@@ -41,9 +41,7 @@ export const LdapSettingsKerberosIntegration = ({
           label={t("allowKerberosAuthentication")}
           labelIcon={
             <HelpItem
-              helpText={t(
-                "user-federation-help:allowKerberosAuthenticationHelp",
-              )}
+              helpText={t("allowKerberosAuthenticationHelp")}
               fieldLabelId="user-federation:allowKerberosAuthentication"
             />
           }
@@ -75,7 +73,7 @@ export const LdapSettingsKerberosIntegration = ({
               label={t("kerberosRealm")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:kerberosRealmHelp")}
+                  helpText={t("kerberosRealmHelp")}
                   fieldLabelId="user-federation:kerberosRealm"
                 />
               }
@@ -113,7 +111,7 @@ export const LdapSettingsKerberosIntegration = ({
               label={t("serverPrincipal")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:serverPrincipalHelp")}
+                  helpText={t("serverPrincipalHelp")}
                   fieldLabelId="user-federation:serverPrincipal"
                 />
               }
@@ -151,7 +149,7 @@ export const LdapSettingsKerberosIntegration = ({
               label={t("keyTab")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:keyTabHelp")}
+                  helpText={t("keyTabHelp")}
                   fieldLabelId="user-federation:keyTab"
                 />
               }
@@ -188,7 +186,7 @@ export const LdapSettingsKerberosIntegration = ({
               label={t("krbPrincipalAttribute")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:krbPrincipalAttributeHelp")}
+                  helpText={t("krbPrincipalAttributeHelp")}
                   fieldLabelId="user-federation:krbPrincipalAttribute"
                 />
               }
@@ -222,7 +220,7 @@ export const LdapSettingsKerberosIntegration = ({
               label={t("debug")}
               labelIcon={
                 <HelpItem
-                  helpText={t("user-federation-help:debugHelp")}
+                  helpText={t("debugHelp")}
                   fieldLabelId="user-federation:debug"
                 />
               }
@@ -254,9 +252,7 @@ export const LdapSettingsKerberosIntegration = ({
           label={t("useKerberosForPasswordAuthentication")}
           labelIcon={
             <HelpItem
-              helpText={t(
-                "user-federation-help:useKerberosForPasswordAuthenticationHelp",
-              )}
+              helpText={t("useKerberosForPasswordAuthenticationHelp")}
               fieldLabelId="user-federation:useKerberosForPasswordAuthentication"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
index 9357c1409f..665bafcb7f 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -46,7 +46,7 @@ export const LdapSettingsSearching = ({
           label={t("editMode")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:editModeLdapHelp")}
+              helpText={t("editModeLdapHelp")}
               fieldLabelId="user-federation:editMode"
             />
           }
@@ -100,7 +100,7 @@ export const LdapSettingsSearching = ({
           label={t("usersDN")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:usersDNHelp")}
+              helpText={t("usersDNHelp")}
               fieldLabelId="user-federation:usersDn"
             />
           }
@@ -137,7 +137,7 @@ export const LdapSettingsSearching = ({
           label={t("usernameLdapAttribute")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:usernameLdapAttributeHelp")}
+              helpText={t("usernameLdapAttributeHelp")}
               fieldLabelId="user-federation:usernameLdapAttribute"
             />
           }
@@ -175,7 +175,7 @@ export const LdapSettingsSearching = ({
           label={t("rdnLdapAttribute")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:rdnLdapAttributeHelp")}
+              helpText={t("rdnLdapAttributeHelp")}
               fieldLabelId="user-federation:rdnLdapAttribute"
             />
           }
@@ -212,7 +212,7 @@ export const LdapSettingsSearching = ({
           label={t("uuidLdapAttribute")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:uuidLdapAttributeHelp")}
+              helpText={t("uuidLdapAttributeHelp")}
               fieldLabelId="user-federation:uuidLdapAttribute"
             />
           }
@@ -250,7 +250,7 @@ export const LdapSettingsSearching = ({
           label={t("userObjectClasses")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:userObjectClassesHelp")}
+              helpText={t("userObjectClassesHelp")}
               fieldLabelId="user-federation:userObjectClasses"
             />
           }
@@ -288,7 +288,7 @@ export const LdapSettingsSearching = ({
           label={t("userLdapFilter")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:userLdapFilterHelp")}
+              helpText={t("userLdapFilterHelp")}
               fieldLabelId="user-federation:userLdapFilter"
             />
           }
@@ -324,7 +324,7 @@ export const LdapSettingsSearching = ({
           label={t("searchScope")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:searchScopeHelp")}
+              helpText={t("searchScopeHelp")}
               fieldLabelId="user-federation:searchScope"
             />
           }
@@ -363,7 +363,7 @@ export const LdapSettingsSearching = ({
           label={t("readTimeout")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:readTimeoutHelp")}
+              helpText={t("readTimeoutHelp")}
               fieldLabelId="user-federation:readTimeout"
             />
           }
@@ -381,7 +381,7 @@ export const LdapSettingsSearching = ({
           label={t("pagination")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:paginationHelp")}
+              helpText={t("paginationHelp")}
               fieldLabelId="user-federation:pagination"
             />
           }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSynchronization.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSynchronization.tsx
index 2d3cbcefd6..3a0ff779a0 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSynchronization.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSynchronization.tsx
@@ -38,7 +38,7 @@ export const LdapSettingsSynchronization = ({
           label={t("importUsers")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:importUsersHelp")}
+              helpText={t("importUsersHelp")}
               fieldLabelId="user-federation:importUsers"
             />
           }
@@ -68,7 +68,7 @@ export const LdapSettingsSynchronization = ({
           label={t("syncRegistrations")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:syncRegistrations")}
+              helpText={t("syncRegistrations")}
               fieldLabelId="user-federation:syncRegistrations"
             />
           }
@@ -95,7 +95,7 @@ export const LdapSettingsSynchronization = ({
           label={t("batchSize")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:batchSizeHelp")}
+              helpText={t("batchSizeHelp")}
               fieldLabelId="user-federation:batchSize"
             />
           }
@@ -113,7 +113,7 @@ export const LdapSettingsSynchronization = ({
           label={t("periodicFullSync")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:periodicFullSyncHelp")}
+              helpText={t("periodicFullSyncHelp")}
               fieldLabelId="user-federation:periodicFullSync"
             />
           }
@@ -144,7 +144,7 @@ export const LdapSettingsSynchronization = ({
             label={t("fullSyncPeriod")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:fullSyncPeriodHelp")}
+                helpText={t("fullSyncPeriodHelp")}
                 fieldLabelId="user-federation:fullSyncPeriod"
               />
             }
@@ -164,7 +164,7 @@ export const LdapSettingsSynchronization = ({
           label={t("periodicChangedUsersSync")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:periodicChangedUsersSyncHelp")}
+              helpText={t("periodicChangedUsersSyncHelp")}
               fieldLabelId="user-federation:periodicChangedUsersSync"
             />
           }
@@ -194,7 +194,7 @@ export const LdapSettingsSynchronization = ({
             label={t("changedUsersSyncPeriod")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:changedUsersSyncHelp")}
+                helpText={t("changedUsersSyncHelp")}
                 fieldLabelId="user-federation:changedUsersSyncPeriod"
               />
             }
diff --git a/js/apps/admin-ui/src/user-federation/ldap/mappers/LdapMapperDetails.tsx b/js/apps/admin-ui/src/user-federation/ldap/mappers/LdapMapperDetails.tsx
index 4dd8525714..a83f7d3a89 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/mappers/LdapMapperDetails.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/mappers/LdapMapperDetails.tsx
@@ -219,10 +219,7 @@ export default function LdapMapperDetails() {
           <FormGroup
             label={t("name")}
             labelIcon={
-              <HelpItem
-                helpText={t("user-federation-help:nameHelp")}
-                fieldLabelId="name"
-              />
+              <HelpItem helpText={t("nameHelp")} fieldLabelId="name" />
             }
             fieldId="kc-ldap-mapper-name"
             isRequired
@@ -260,9 +257,7 @@ export default function LdapMapperDetails() {
               labelIcon={
                 <HelpItem
                   helpText={
-                    mapper?.helpText
-                      ? mapper.helpText
-                      : t("user-federation-help:mapperTypeHelp")
+                    mapper?.helpText ? mapper.helpText : t("mapperTypeHelp")
                   }
                   fieldLabelId="mapperType"
                 />
@@ -284,9 +279,7 @@ export default function LdapMapperDetails() {
               labelIcon={
                 <HelpItem
                   helpText={
-                    mapper?.helpText
-                      ? mapper.helpText
-                      : t("user-federation-help:mapperTypeHelp")
+                    mapper?.helpText ? mapper.helpText : t("mapperTypeHelp")
                   }
                   fieldLabelId="mapperType"
                 />
diff --git a/js/apps/admin-ui/src/user-federation/shared/SettingsCache.tsx b/js/apps/admin-ui/src/user-federation/shared/SettingsCache.tsx
index c4db30e120..16d356c173 100644
--- a/js/apps/admin-ui/src/user-federation/shared/SettingsCache.tsx
+++ b/js/apps/admin-ui/src/user-federation/shared/SettingsCache.tsx
@@ -79,7 +79,7 @@ const CacheFields = ({ form }: { form: UseFormReturn }) => {
         label={t("cachePolicy")}
         labelIcon={
           <HelpItem
-            helpText={t("user-federation-help:cachePolicyHelp")}
+            helpText={t("cachePolicyHelp")}
             fieldLabelId="user-federation:cachePolicy"
           />
         }
@@ -117,7 +117,7 @@ const CacheFields = ({ form }: { form: UseFormReturn }) => {
           label={t("evictionDay")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:evictionDayHelp")}
+              helpText={t("evictionDayHelp")}
               fieldLabelId="user-federation:evictionDay"
             />
           }
@@ -175,7 +175,7 @@ const CacheFields = ({ form }: { form: UseFormReturn }) => {
             label={t("evictionHour")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:evictionHourHelp")}
+                helpText={t("evictionHourHelp")}
                 fieldLabelId="user-federation:evictionHour"
               />
             }
@@ -207,7 +207,7 @@ const CacheFields = ({ form }: { form: UseFormReturn }) => {
             label={t("evictionMinute")}
             labelIcon={
               <HelpItem
-                helpText={t("user-federation-help:evictionMinuteHelp")}
+                helpText={t("evictionMinuteHelp")}
                 fieldLabelId="user-federation:evictionMinute"
               />
             }
@@ -242,7 +242,7 @@ const CacheFields = ({ form }: { form: UseFormReturn }) => {
           label={t("maxLifespan")}
           labelIcon={
             <HelpItem
-              helpText={t("user-federation-help:maxLifespanHelp")}
+              helpText={t("maxLifespanHelp")}
               fieldLabelId="user-federation:maxLifespan"
             />
           }
diff --git a/js/apps/admin-ui/src/user/UserCredentials.tsx b/js/apps/admin-ui/src/user/UserCredentials.tsx
index 0db3cc859d..236d9a3e06 100644
--- a/js/apps/admin-ui/src/user/UserCredentials.tsx
+++ b/js/apps/admin-ui/src/user/UserCredentials.tsx
@@ -401,7 +401,7 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
               <Tr className="kc-table-header">
                 <Th>
                   <HelpItem
-                    helpText={t("users:userCredentialsHelpText")}
+                    helpText={t("userCredentialsHelpText")}
                     fieldLabelId="users:userCredentialsHelpTextLabel"
                   />
                 </Th>
diff --git a/js/apps/admin-ui/src/user/UserForm.tsx b/js/apps/admin-ui/src/user/UserForm.tsx
index 7e7a403282..afbedb7bcc 100644
--- a/js/apps/admin-ui/src/user/UserForm.tsx
+++ b/js/apps/admin-ui/src/user/UserForm.tsx
@@ -320,9 +320,7 @@ export const UserForm = ({
           fieldId="kc-groups"
           validated={errors.requiredActions ? "error" : "default"}
           helperTextInvalid={t("required")}
-          labelIcon={
-            <HelpItem helpText={t("users-help:groups")} fieldLabelId="groups" />
-          }
+          labelIcon={<HelpItem helpText={t("groups")} fieldLabelId="groups" />}
         >
           <Controller
             name="groups"