1 files changed, 7 insertions, 7 deletions

diff --git a/webapp/components/admin_console/setting.jsx b/webapp/components/admin_console/setting.jsx
index 7dee6c8dc..024111fa5 100644
--- a/webapp/components/admin_console/setting.jsx
+++ b/webapp/components/admin_console/setting.jsx
@@ -5,20 +5,19 @@ import React from 'react';
 
 export default class Setting extends React.Component {
     render() {
-        let marginClass = '';
-        if (this.props.margin === 'small') {
-            marginClass = ' form-group--small';
-        }
-
         return (
-            <div className={'form-group' + marginClass}>
+            <div className='form-group'>
                 <label
                     className='control-label col-sm-4'
+                    htmlFor={this.props.inputId}
                 >
                     {this.props.label}
                 </label>
                 <div className='col-sm-8'>
                     {this.props.children}
+                    <div className='help-text'>
+                        {this.props.helpText}
+                    </div>
                 </div>
             </div>
         );
@@ -28,7 +27,8 @@ Setting.defaultProps = {
 };
 
 Setting.propTypes = {
+    inputId: React.PropTypes.string,
     label: React.PropTypes.node.isRequired,
     children: React.PropTypes.node.isRequired,
-    margin: React.PropTypes.oneOf(['', 'small'])
+    helpText: React.PropTypes.node
 };