diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index 942307a3f..2468496b7 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -43,11 +43,7 @@
 }
 
 .actionBox {
-  position: absolute;
-  right: 20px;
-  top: 20px;
-  text-align: center;
-  width: 100px;
+  flex-grow: 0;
 }
 
 .cancelButton {
@@ -64,4 +60,28 @@
 .changedSave {
   background-color: #00796B;
   color: white;
+}
+
+.errorList {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.errorItem {
+  padding: 5px 10px;
+  margin-bottom: 20px;
+  color: #b71c1c;
+  border-radius: 2px;
+  display: inline-block;
+  background: #F9D3CE;
+}
+
+.container {
+  display: flex;
+}
+
+.content {
+  flex-grow: 1;
+  padding-right: 40px;
 }
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
index 06c91926c..38f211781 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -7,9 +7,25 @@ import Slot from 'coral-framework/components/Slot';
 import t from 'coral-framework/services/i18n';
 import ConfigurePage from './ConfigurePage';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
+import validate from 'coral-framework/helpers/validate';
+import errorMsj from 'coral-framework/helpers/error';
 
 class OrganizationSettings extends React.Component {
-  state = { editing: false };
+  state = { editing: false, errors: [] };
+
+  addError = err => {
+    if (this.state.errors.indexOf(err) === -1) {
+      this.setState(({ errors }) => ({
+        errors: errors.concat(err),
+      }));
+    }
+  };
+
+  removeError = err => {
+    this.setState(({ errors }) => ({
+      errors: errors.filter(i => i !== err),
+    }));
+  };
 
   toggleEditing = () => {
     this.setState(({ editing }) => ({
@@ -29,8 +45,21 @@ class OrganizationSettings extends React.Component {
   };
 
   updateEmail = event => {
-    const updater = { organizationContactEmail: { $set: event.target.value } };
-    this.props.updatePending({ updater });
+    let error = null;
+    const email = event.target.value;
+
+    // Add a blocker error
+    if (!validate.email(email)) {
+      error = true;
+      this.addError('email');
+    } else {
+      this.removeError('email');
+    }
+
+    const updater = { organizationContactEmail: { $set: email } };
+    const errorUpdater = { organizationEmail: { $set: error } };
+
+    this.props.updatePending({ updater, errorUpdater });
   };
 
   cancelEditing = () => {
@@ -43,84 +72,101 @@ class OrganizationSettings extends React.Component {
     this.disableEditing();
   };
 
+  displayErrors = (errors = []) => (
+    <ul className={styles.errorList}>
+      {errors.map((errKey, i) => (
+        <li key={`${i}_${errKey}`} className={styles.errorItem}>
+          {errorMsj[errKey]}
+        </li>
+      ))}
+    </ul>
+  );
+
   render() {
     const { settings, slotPassthrough, canSave } = this.props;
+    const hasErrors = this.state.errors.length;
+
     return (
       <ConfigurePage title={t('configure.organization_information')}>
         <p>{t('configure.organization_info_copy')}</p>
         <p>{t('configure.organization_info_copy_2')}</p>
         <ConfigureCard>
-          {!this.state.editing ? (
-            <div className={styles.actionBox}>
-              <Button
-                className={styles.button}
-                icon="settings"
-                onClick={this.toggleEditing}
-                full
-              >
-                {t('configure.edit_info')}
-              </Button>
+          <div className={styles.container}>
+            <div className={styles.content}>
+              {this.displayErrors(this.state.errors)}
+              <ul className={styles.detailList}>
+                <li className={styles.detailItem}>
+                  <label
+                    className={styles.detailLabel}
+                    id={t('configure.organization_name')}
+                  >
+                    {t('configure.organization_name')}
+                  </label>
+                  <input
+                    type="text"
+                    className={cn(styles.detailValue, {
+                      [styles.editable]: this.state.editing,
+                    })}
+                    onChange={this.updateName}
+                    value={settings.organizationName}
+                    id={t('configure.organization_name')}
+                    readOnly={!this.state.editing}
+                  />
+                </li>
+                <li className={styles.detailItem}>
+                  <label
+                    className={styles.detailLabel}
+                    id={t('configure.organization_contact_email')}
+                  >
+                    {t('configure.organization_contact_email')}
+                  </label>
+                  <input
+                    type="text"
+                    className={cn(styles.detailValue, {
+                      [styles.editable]: this.state.editing,
+                    })}
+                    onChange={this.updateEmail}
+                    value={settings.organizationContactEmail}
+                    id={t('configure.organization_contact_email')}
+                    readOnly={!this.state.editing}
+                  />
+                </li>
+              </ul>
             </div>
-          ) : (
-            <div className={styles.actionBox}>
-              {canSave ? (
+            {!this.state.editing ? (
+              <div className={styles.actionBox}>
                 <Button
-                  raised
-                  onClick={this.save}
-                  className={styles.changedSave}
-                  icon="check"
+                  className={styles.button}
+                  icon="settings"
+                  onClick={this.toggleEditing}
                   full
                 >
-                  {t('configure.save')}
+                  {t('configure.edit_info')}
                 </Button>
-              ) : (
-                <Button className={styles.button} disabled icon="check" full>
-                  {t('configure.save')}
-                </Button>
-              )}
-              <a className={styles.cancelButton} onClick={this.cancelEditing}>
-                {t('cancel')}
-              </a>
-            </div>
-          )}
-          <ul className={styles.detailList}>
-            <li className={styles.detailItem}>
-              <label
-                className={styles.detailLabel}
-                id={t('configure.organization_name')}
-              >
-                {t('configure.organization_name')}
-              </label>
-              <input
-                type="text"
-                className={cn(styles.detailValue, {
-                  [styles.editable]: this.state.editing,
-                })}
-                onChange={this.updateName}
-                value={settings.organizationName}
-                id={t('configure.organization_name')}
-                readOnly={!this.state.editing}
-              />
-            </li>
-            <li className={styles.detailItem}>
-              <label
-                className={styles.detailLabel}
-                id={t('configure.organization_contact_email')}
-              >
-                {t('configure.organization_contact_email')}
-              </label>
-              <input
-                type="text"
-                className={cn(styles.detailValue, {
-                  [styles.editable]: this.state.editing,
-                })}
-                onChange={this.updateEmail}
-                value={settings.organizationContactEmail}
-                id={t('configure.organization_contact_email')}
-                readOnly={!this.state.editing}
-              />
-            </li>
-          </ul>
+              </div>
+            ) : (
+              <div className={styles.actionBox}>
+                {canSave && !hasErrors ? (
+                  <Button
+                    raised
+                    onClick={this.save}
+                    className={styles.changedSave}
+                    icon="check"
+                    full
+                  >
+                    {t('configure.save')}
+                  </Button>
+                ) : (
+                  <Button className={styles.button} disabled icon="check" full>
+                    {t('configure.save')}
+                  </Button>
+                )}
+                <a className={styles.cancelButton} onClick={this.cancelEditing}>
+                  {t('cancel')}
+                </a>
+              </div>
+            )}
+          </div>
         </ConfigureCard>
         <Slot fill="adminOrganizationSettings" passthrough={slotPassthrough} />
       </ConfigurePage>