diff --git a/core/includes/mail.inc b/core/includes/mail.inc
index 25235f9..f1d3002 100644
--- a/core/includes/mail.inc
+++ b/core/includes/mail.inc
@@ -118,6 +118,11 @@
  */
 function drupal_mail($module, $key, $to, $langcode, $params = array(), $from = NULL, $send = TRUE) {
   $site_mail = config('system.site')->get('mail');
+  $notify = config('user.settings')->get('notify.' . $key);
+  if ($notify) {
+    $notify_mail = config('system.site')->get('notification');
+    $site_mail = $notify_mail ? $notify_mail : $site_mail;
+  }
   if (empty($site_mail)) {
     $site_mail = ini_get('sendmail_from');
   }
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index dcd76d7..bb0a3aa 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -389,6 +389,15 @@ function user_admin_settings($form, &$form_state) {
     '#default_value' => $config->get('signatures'),
   );
 
+  // Default notifications address.
+  $form['mail_notification_address'] = array(
+    '#type' => 'textfield',
+    '#title' => t('E-mail address'),
+    '#default_value' => config('system.site')->get('notification'),
+    '#description' => 'The e-mail address used to send out notifications. Leave this empty to use the default system e-mail address.',
+    '#maxlength' => 180,
+  );
+
   $form['email_title'] = array(
     '#type' => 'item',
     '#title' => t('E-mails'),
@@ -647,6 +656,9 @@ function user_admin_settings_submit($form, &$form_state) {
     ->set('status_canceled.body', $form_state['values']['user_mail_status_canceled_body'])
     ->set('status_canceled.subject', $form_state['values']['user_mail_status_canceled_subject'])
     ->save();
+  config('system.site')
+    ->set('notification', $form_state['values']['mail_notification_address'])
+    ->save();
 }
 
 /**