diff --git a/platform/drupal/install.inc b/platform/drupal/install.inc
index 565885f..b1bcc8c 100644
--- a/platform/drupal/install.inc
+++ b/platform/drupal/install.inc
@@ -6,4 +6,3 @@
  */
 
 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 f61b57b..1ccbd33 100644
--- a/platform/drupal/install_6.inc
+++ b/platform/drupal/install_6.inc
@@ -47,19 +47,12 @@ function install_verify_settings() {
   return FALSE;
 }
 
-function install_create_admin_user($client_email = NULL) {
+function install_create_admin_user($client_email) {
   $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;
   }
-  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);
@@ -361,10 +354,12 @@ function install_main() {
   cache_clear_all();
   variable_set('install_profile', $profile);
 
-  $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;
+  $client_email = drush_get_option('client_email', FALSE);
+  if (!$client_email || !filter_var($client_email, FILTER_VALIDATE_EMAIL)) {
+    global $url;
+    $default_client_email = 'admin@' . $url;
+    drush_log(dt('Error validating client email `!email`. Please check your user account email. Using default (!default) instead.', array('!email' => $client_email, '!default' => $default_client_email)) , 'warning');
+    $client_email = $default_client_email;
   }
 
   $account = install_create_admin_user($client_email);
diff --git a/platform/drupal/install_7.inc b/platform/drupal/install_7.inc
index 54bed3f..396c9ee 100644
--- a/platform/drupal/install_7.inc
+++ b/platform/drupal/install_7.inc
@@ -113,10 +113,11 @@ function install_main() {
     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;
   }
-  $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;
+  $client_email = drush_get_option('client_email', FALSE);
+  if (!$client_email || !filter_var($client_email, FILTER_VALIDATE_EMAIL)) {
+    $default_client_email = 'admin@' . $url;
+    drush_log(dt('Error validating client email `!email`. Please check your user account email. Using default (!default) instead.', array('!email' => $client_email, '!default' => $default_client_email)) , 'warning');
+    $client_email = $default_client_email;
   }
   $settings = array(
     'parameters' => array(