diff --git a/webapp/components/admin_console/admin_settings.jsx b/webapp/components/admin_console/admin_settings.jsx
index 6765dd0698..2ab2c63320 100644
--- a/webapp/components/admin_console/admin_settings.jsx
+++ b/webapp/components/admin_console/admin_settings.jsx
@@ -114,9 +114,11 @@ export default class AdminSettings extends React.Component {
                     role='form'
                 >
                     {this.renderSettings()}
+                    <div className='form-group'>
+                        <FormError error={this.state.serverError}/>
+                    </div>
                     <div className='form-group'>
                         <div className='col-sm-12'>
-                            <FormError error={this.state.serverError}/>
                             <SaveButton
                                 saving={this.state.saving}
                                 disabled={!this.state.saveNeeded || (this.canSave && !this.canSave())}
diff --git a/webapp/components/admin_console/multiselect_settings.jsx b/webapp/components/admin_console/multiselect_settings.jsx
index 3120e03a8d..8aad5d6eb2 100644
--- a/webapp/components/admin_console/multiselect_settings.jsx
+++ b/webapp/components/admin_console/multiselect_settings.jsx
@@ -54,10 +54,7 @@ export default class MultiSelectSetting extends React.Component {
                     onChange={this.handleChange}
                     value={this.props.selected}
                 />
-                <FormError
-                    noMargin={true}
-                    error={this.state.error}
-                />
+                <FormError error={this.state.error}/>
             </Setting>
         );
     }
diff --git a/webapp/components/form_error.jsx b/webapp/components/form_error.jsx
index 395adfaab7..3c73759c58 100644
--- a/webapp/components/form_error.jsx
+++ b/webapp/components/form_error.jsx
@@ -8,7 +8,6 @@ export default class FormError extends React.Component {
         // accepts either a single error or an array of errors
         return {
             error: React.PropTypes.node,
-            noMargin: React.PropTypes.node,
             errors: React.PropTypes.arrayOf(React.PropTypes.node)
         };
     }
@@ -27,7 +26,6 @@ export default class FormError extends React.Component {
 
         // look for the first truthy error to display
         let message = this.props.error;
-        const noMargin = this.props.noMargin;
 
         if (!message) {
             for (const error of this.props.errors) {
@@ -41,18 +39,8 @@ export default class FormError extends React.Component {
             return null;
         }
 
-        if (noMargin) {
-            return (
-                <div className='has-error'>
-                    <label className='control-label'>
-                        {message}
-                    </label>
-                </div>
-            );
-        }
-
         return (
-            <div className='form-group has-error'>
+            <div className='col-sm-12 has-error'>
                 <label className='control-label'>
                     {message}
                 </label>