diff --git a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
index 72dfbf4af8..0d649c9305 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
@@ -1,11 +1,13 @@
 //@flow
 import React from "react";
+import {Help} from "../index";
 
 type Props = {
   label?: string,
   checked: boolean,
   onChange?: boolean => void,
-  disabled?: boolean
+  disabled?: boolean,
+  helpText?: string
 };
 class Checkbox extends React.Component<Props> {
   onCheckboxChange = (event: SyntheticInputEvent<HTMLInputElement>) => {
@@ -14,10 +16,22 @@ class Checkbox extends React.Component<Props> {
     }
   };
 
+  renderHelp = () => {
+    const helpText = this.props.helpText;
+    if(helpText){
+      return (
+        <div className="control columns is-vcentered">
+          <Help message={helpText} />
+        </div>);
+    }
+    else
+      return null;
+  };
+
   render() {
     return (
-      <div className="field">
-        <div className="control">
+      <div className="field is-grouped">
+        <div className="control is-expanded">
           <label className="checkbox" disabled={this.props.disabled}>
             <input
               type="checkbox"
@@ -28,6 +42,7 @@ class Checkbox extends React.Component<Props> {
             {this.props.label}
           </label>
         </div>
+        {this.renderHelp()}
       </div>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/forms/InputField.js b/scm-ui-components/packages/ui-components/src/forms/InputField.js
index e29d1051d7..6b9a857c0d 100644
--- a/scm-ui-components/packages/ui-components/src/forms/InputField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/InputField.js
@@ -53,7 +53,7 @@ class InputField extends React.Component<Props> {
     }
     else
       return null;
-  }
+  };
 
   handleKeyPress = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
     const onReturnPressed = this.props.onReturnPressed;
diff --git a/scm-ui/src/config/components/form/GeneralSettings.js b/scm-ui/src/config/components/form/GeneralSettings.js
index 1e0b4bc1cf..ffc3e7452a 100644
--- a/scm-ui/src/config/components/form/GeneralSettings.js
+++ b/scm-ui/src/config/components/form/GeneralSettings.js
@@ -66,6 +66,7 @@ class GeneralSettings extends React.Component<Props> {
           label={t("general-settings.enabled-xsrf-protection")}
           onChange={this.handleEnabledXsrfProtectionChange}
           disabled={!hasUpdatePermission}
+          helpText={"hey"}
         />
         <Checkbox
           checked={enableRepositoryArchive}