diff --git a/EVENTS.txt b/EVENTS.txt
index 5b6483093e..255869afda 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -300,11 +300,11 @@ EndEmailFormData: just after showing form input fields on email settings page
 
 StartEmailSaveForm: before starting to save a email settings form
 - $action: action object being shown
-- &$user: user being saved
+- $scoped: Profile user having their email settings saved
 
 EndEmailSaveForm: after saving a email settings form (after commit)
 - $action: action object being shown
-- &$user: user being saved
+- $scoped: Profile user having their email settings saved
 
 StartRegistrationFormData: just before showing text entry fields on registration page
 - $action: action object being shown
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 117c4c4f7c..cc1a345f09 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -322,7 +322,7 @@ class EmailsettingsAction extends SettingsAction
     {
         $user = common_current_user();
 
-        if (Event::handle('StartEmailSaveForm', array($this, &$user))) {
+        if (Event::handle('StartEmailSaveForm', array($this, $this->scoped))) {
             $emailnotifysub   = $this->boolean('emailnotifysub');
             $emailnotifyfav   = $this->boolean('emailnotifyfav');
             $emailnotifymsg   = $this->boolean('emailnotifymsg');
@@ -355,7 +355,7 @@ class EmailsettingsAction extends SettingsAction
 
             $user->query('COMMIT');
 
-            Event::handle('EndEmailSaveForm', array($this));
+            Event::handle('EndEmailSaveForm', array($this, $this->scoped));
 
             // TRANS: Confirmation message for successful e-mail preferences save.
             $this->showForm(_('Email preferences saved.'), true);
diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php
index da94322411..da682e0454 100644
--- a/plugins/EmailSummary/EmailSummaryPlugin.php
+++ b/plugins/EmailSummary/EmailSummaryPlugin.php
@@ -115,39 +115,35 @@ class EmailSummaryPlugin extends Plugin
      * Add a checkbox to turn off email summaries
      *
      * @param Action $action Action being executed (emailsettings)
+     * @param Profile $scoped Profile for whom settings are configured (current user)
      *
      * @return boolean hook value
      */
-    function onEndEmailSaveForm($action)
+    public function onEndEmailSaveForm(Action $action, Profile $scoped)
     {
         $sendSummary = $action->boolean('emailsummary');
 
-        $user = common_current_user();
+        $ess = Email_summary_status::getKV('user_id', $scoped->id);
 
-        if (!empty($user)) {
+        if (empty($ess)) {
 
-            $ess = Email_summary_status::getKV('user_id', $user->id);
+            $ess = new Email_summary_status();
 
-            if (empty($ess)) {
+            $ess->user_id      = $scoped->id;
+            $ess->send_summary = $sendSummary;
+            $ess->created      = common_sql_now();
+            $ess->modified     = common_sql_now();
 
-                $ess = new Email_summary_status();
+            $ess->insert();
 
-                $ess->user_id      = $user->id;
-                $ess->send_summary = $sendSummary;
-                $ess->created      = common_sql_now();
-                $ess->modified     = common_sql_now();
+        } else {
 
-                $ess->insert();
+            $orig = clone($ess);
 
-            } else {
+            $ess->send_summary = $sendSummary;
+            $ess->modified     = common_sql_now();
 
-                $orig = clone($ess);
-
-                $ess->send_summary = $sendSummary;
-                $ess->modified     = common_sql_now();
-
-                $ess->update($orig);
-            }
+            $ess->update($orig);
         }
 
         return true;