diff --git a/modules/redhen_fields/redhen_fields.module b/modules/redhen_fields/redhen_fields.module
index 3fcc09c..ddccc1e 100755
--- a/modules/redhen_fields/redhen_fields.module
+++ b/modules/redhen_fields/redhen_fields.module
@@ -306,7 +306,7 @@ function redhen_fields_field_validate($entity_type, $entity, $field, $instance,
       }
 
       // At least one email is required.
-      if (empty($emails)) {
+      if (empty($emails) && !variable_get('redhen_fields_email_optional')) {
         $errors[$field['field_name']][$langcode][0][] = array(
           'error' => 'redhen_fields_invalid_email',
           'message' => t('At least one email is required.'),
@@ -324,7 +324,7 @@ function redhen_fields_field_validate($entity_type, $entity, $field, $instance,
         }
 
         // Ensure at least one email is marked as primary.
-        if (!$default) {
+	if (!$default && !variable_get('redhen_fields_email_optional')) {
           $errors[$field['field_name']][$langcode][0][] = array(
             'error' => 'redhen_fields_invalid_email',
             'message' => t('One email must be marked as primary.'),
@@ -868,3 +868,19 @@ function redhen_fields_create_email_instance($bundle_name) {
     field_create_instance($email_field);
   }
 }
+
+
+/**
+ * Implements hook_redhen_settings().
+ */
+function redhen_fields_redhen_settings() {
+  return array(
+    'redhen_fields_email_optional' => array(
+      '#type' => 'checkbox',
+      '#title' => t('Make RedHen Contact email optional'),
+      '#description' => t('If checked, email field can be empty.'),
+      '#default_value' => variable_get('redhen_fields_email_optional', FALSE),
+    ),
+  );
+}
+