diff --git a/modules/user/user.module b/modules/user/user.module
index 14e1459..922627b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -980,7 +980,7 @@ function user_account_form(&$form, &$form_state) {
     '#title' => t('E-mail address'),
     '#maxlength' => EMAIL_MAX_LENGTH,
     '#description' => t('A valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'),
-    '#required' => TRUE,
+    '#required' => (empty($account->mail) && user_access('administer users')) ? FALSE : TRUE,
     '#default_value' => (!$register ? $account->mail : ''),
   );