diff --git a/scm-ui/public/locales/en/config.json b/scm-ui/public/locales/en/config.json
index 9939c077aa..cfd4f6192c 100644
--- a/scm-ui/public/locales/en/config.json
+++ b/scm-ui/public/locales/en/config.json
@@ -67,24 +67,26 @@
   },
   "help": {
     "realmDescriptionHelpText": "Enter authentication realm description",
-    "dateFormatHelpText": "Moments date format. Please have a look at \n <a href=`http://momentjs.com/docs/#/displaying/format/` target=`_blank`>http://momentjs.com/docs/#/displaying/format/</a>.<br />\n<b>Note:</b><br />\n {0} - is replaced by a `time ago` string (e.g. 2 hours ago).",
-    "pluginRepositoryHelpText": "The url of the plugin repository.<br />Explanation of the {placeholders}:\n <br /><b>version</b> = SCM-Manager Version<br /><b>os</b> = Operation System<br /><b>arch</b> = Architecture",
+    "dateFormatHelpText": "Moments date format. Please have a look at http://momentjs.com/docs/#/displaying/format/. Note: {0} - is replaced by a `time ago` string (e.g. 2 hours ago).",
+    "pluginRepositoryHelpText": "The url of the plugin repository. Explanation of the placeholders: version = SCM-Manager Version; os = Operation System; arch = Architecture",
     "enableForwardingHelpText": "Enbale mod_proxy port forwarding.",
     "enableRepositoryArchiveHelpText": "Enable repository archives. A complete page reload is required after a change of this value.",
     "disableGroupingGridHelpText": "Disable repository Groups. A complete page reload is required after a change of this value.",
     "allowAnonymousAccessHelpText": "Anonymous users have read access on public repositories.",
-    "skipFailedAuthenticatorsHelpText": "Do not stop the authentication chain, \n if an authenticator finds the user but fails to authenticate the user.",
+    "skipFailedAuthenticatorsHelpText": "Do not stop the authentication chain, if an authenticator finds the user but fails to authenticate the user.",
     "adminGroupsHelpText": "Names of groups with admin permissions.",
     "adminUsersHelpText": "Names of users with admin permissions.",
     "forceBaseUrlHelpText": "Redirects to the base url if the request comes from a other url",
-    "baseUrlHelpText": "The url of the application (with context path) i.e. http://localhost:8080/scm",
+    "baseUrlHelpText": "The url of the application (with context path), i.e. http://localhost:8080/scm",
     "loginAttemptLimitHelpText": "Maximum allowed login attempts. Use -1 to disable the login attempt limit.",
-    "loginAttemptLimitTimeoutHelpText": "Timeout in seconds for users which are temporary disabled,\n because of too many failed login attempts.",
+    "loginAttemptLimitTimeoutHelpText": "Timeout in seconds for users which are temporary disabled, because of too many failed login attempts.",
     "enableProxyHelpText": "Enable Proxy",
     "proxyPortHelpText": "The proxy port",
     "proxyPasswordHelpText": "The password for the proxy server authentication.",
     "proxyServerHelpText": "The proxy server",
     "proxyUserHelpText": "The username for the proxy server authentication.",
-    "proxyExcludesHelpText": "A comma separated list of glob patterns for hostnames which should be excluded from proxy settings."
+    "proxyExcludesHelpText": "Glob patterns for hostnames which should be excluded from proxy settings.",
+    "enableXsrfProtectionHelpText": "Enable Xsrf Cookie Protection. Note: This feature is still experimental.",
+    "defaultNameSpaceStrategyHelpText": "The default namespace strategy"
   }
 }
diff --git a/scm-ui/src/config/components/form/GeneralSettings.js b/scm-ui/src/config/components/form/GeneralSettings.js
index dc5a35214e..661cfb07c0 100644
--- a/scm-ui/src/config/components/form/GeneralSettings.js
+++ b/scm-ui/src/config/components/form/GeneralSettings.js
@@ -62,6 +62,7 @@ class GeneralSettings extends React.Component<Props> {
           onChange={this.handleDefaultNamespaceStrategyChange}
           value={defaultNamespaceStrategy}
           disabled={!hasUpdatePermission}
+          helpText={t("help.defaultNameSpaceStrategyHelpText")}
         />
         <Checkbox
           checked={enabledXsrfProtection}
diff --git a/scm-ui/src/groups/components/MemberNameTable.js b/scm-ui/src/groups/components/MemberNameTable.js
index b5add04c4b..59f12461fe 100644
--- a/scm-ui/src/groups/components/MemberNameTable.js
+++ b/scm-ui/src/groups/components/MemberNameTable.js
@@ -21,7 +21,7 @@ class MemberNameTable extends React.Component<Props, State> {
       <div>
         <LabelWithHelpIcon
           label={t("group.members")}
-          helpText={t("group-form.help.membersHelpText")}
+          helpText={t("group-form.help.memberHelpText")}
         />
         <table className="table is-hoverable is-fullwidth">
           <tbody>