diff --git a/platform/drupal/install.inc b/platform/drupal/install.inc
index b1bcc8c985b4060461a35719b96954dbf0de34b3..565885f7adc0f071524ffc6e8156c8e51d581101 100644
--- a/platform/drupal/install.inc
+++ b/platform/drupal/install.inc
@@ -6,3 +6,4 @@
  */
 
 define('PROVISION_DEFAULT_ADMIN_USER', 'admin');
+define('PROVISION_DEFAULT_ADMIN_EMAIL', 'admin@example.com');
diff --git a/platform/drupal/install_6.inc b/platform/drupal/install_6.inc
index 00c88cf4227f974df48d2ceeae457643e8dd235d..f61b57ba95756c8809130036d2a608a8a64ab259 100644
--- a/platform/drupal/install_6.inc
+++ b/platform/drupal/install_6.inc
@@ -50,12 +50,17 @@ function install_verify_settings() {
 function install_create_admin_user($client_email = NULL) {
   $name = drush_get_option('admin_user', PROVISION_DEFAULT_ADMIN_USER);
   if ($error = user_validate_name($name)) {
+    drush_log(dt('Error setting UID username to `!user`: ', array('!user' => $name)) . $error . dt(' Using default (!default) instead.', array('!default' => PROVISION_DEFAULT_ADMIN_USER)), 'warning');
     $name = PROVISION_DEFAULT_ADMIN_USER;
-    drush_log(dt('Error setting UID username to `!user`: ', array('!user' => $name)) . $error . dt(' Using default (!default) instead.', array('!default' => $name)), 'warning');
   }
-  if (!$client_email) {
-    $client_email = 'webmaster@localhost';
+  if (!isset($client_email)) {
+    $client_email = drush_get_option('client_email', PROVISION_DEFAULT_ADMIN_EMAIL);
+    if (!filter_var($client_email, FILTER_VALIDATE_EMAIL)) {
+      drush_log(dt('Error validating client email `!email`. Please check your user account email. Using default (!default) instead.', array('!email' => $client_email, '!default' => PROVISION_DEFAULT_ADMIN_EMAIL)) , 'warning');
+      $client_email = PROVISION_DEFAULT_ADMIN_EMAIL;
+    }
   }
+
   // create the admin account
   $account = user_load(1);
   $edit['name'] = $name;
@@ -356,7 +361,12 @@ function install_main() {
   cache_clear_all();
   variable_set('install_profile', $profile);
 
-  $client_email = drush_get_option('client_email');
+  $client_email = drush_get_option('client_email', PROVISION_DEFAULT_ADMIN_EMAIL);
+  if (!filter_var($client_email, FILTER_VALIDATE_EMAIL)) {
+    drush_log(dt('Error validating client email `!email`. Please check your user account email. Using default (!default) instead.', array('!email' => $client_email, '!default' => PROVISION_DEFAULT_ADMIN_EMAIL)) , 'warning');
+    $client_email = PROVISION_DEFAULT_ADMIN_EMAIL;
+  }
+
   $account = install_create_admin_user($client_email);
   $onetime = user_pass_reset_url($account);
   // Store the one time login link in an option so the front end can direct the user to their new site.
diff --git a/platform/drupal/install_7.inc b/platform/drupal/install_7.inc
index 7f7ecbc5eb332b81c379f391af61a21bcff0d53b..54bed3f53d48f959c16493c7186d537c8dff69ae 100644
--- a/platform/drupal/install_7.inc
+++ b/platform/drupal/install_7.inc
@@ -74,8 +74,6 @@ function install_mail($key, &$message, $params) {
 function install_main() {
   global $profile, $install_locale, $conf, $url, $base_url;
 
-  $client_email = drush_get_option('client_email');
-
   require_once DRUPAL_ROOT . '/includes/install.core.inc';
   require_once DRUPAL_ROOT . '/includes/entity.inc';
   require_once DRUPAL_ROOT . '/includes/unicode.inc';
@@ -112,8 +110,13 @@ function install_main() {
   $account_pass = provision_password();
   $name = drush_get_option('admin_user', PROVISION_DEFAULT_ADMIN_USER);
   if ($error = user_validate_name($name)) {
+    drush_log(dt('Error setting UID username to `!user`: ', array('!user' => $name)) . $error . dt(' Using default (!default) instead.', array('!default' => PROVISION_DEFAULT_ADMIN_USER)) , 'warning');
     $name = PROVISION_DEFAULT_ADMIN_USER;
-    drush_log(dt('Error setting UID username to `!user`: ', array('!user' => $name)) . $error . dt(' Using default (!default) instead.', array('!default' => $name)) , 'warning');
+  }
+  $client_email = drush_get_option('client_email', PROVISION_DEFAULT_ADMIN_EMAIL);
+  if (!filter_var($client_email, FILTER_VALIDATE_EMAIL)) {
+    drush_log(dt('Error validating client email `!email`. Please check your user account email. Using default (!default) instead.', array('!email' => $client_email, '!default' => PROVISION_DEFAULT_ADMIN_EMAIL)) , 'warning');
+    $client_email = PROVISION_DEFAULT_ADMIN_EMAIL;
   }
   $settings = array(
     'parameters' => array(
@@ -125,10 +128,10 @@ function install_main() {
       'install_settings_form' => $db_spec,
       'install_configure_form' => array(
         'site_name' => $url,
-        'site_mail' => $client_email ? $client_email : 'admin@example.com',
+        'site_mail' => $client_email,
         'account' => array(
           'name' => $name,
-          'mail' => $client_email ? $client_email : 'admin@example.com',
+          'mail' => $client_email,
           'pass' => array(
             'pass1' => $account_pass,
             'pass2' => $account_pass,
@@ -169,7 +172,7 @@ function install_main() {
   drush_set_option('login_link', $onetime . '/login');
   drush_log(t('Login url: !onetime', array('!onetime' => $onetime . '/login')), 'success');
 
-  if ($client_email) {
+  if (drush_get_option('client_email', FALSE)) {
     install_send_welcome_mail($url, $account, $install_locale, $client_email, $onetime);
   }
 }