diff --git a/multiple_email.module b/multiple_email.module
index 36dc01e..7712eca 100644
--- a/multiple_email.module
+++ b/multiple_email.module
@@ -681,11 +681,14 @@ function multiple_email_delete_email($eid) {
 /**
  * Changes specified user's primary e-mail - no error checking!
  *
- * @param object $account
  * @param object $email
+ * @param object $account
  */
-function multiple_email_make_primary($email) {
-  $account = user_load($email->uid);
+function multiple_email_make_primary($email, $account = NULL) {
+  // Legacy, in case other modules use this function
+  if (empty($account)) {
+    $account = user_load($email->uid);
+  }
   user_save($account, array('mail' => $email->email));
 }
 
diff --git a/multiple_email_primary_page.inc b/multiple_email_primary_page.inc
index b6cb315..706756a 100644
--- a/multiple_email_primary_page.inc
+++ b/multiple_email_primary_page.inc
@@ -51,7 +51,7 @@ function multiple_email_primary_form_submit($form, &$form_state) {
     multiple_email_confirm_email($email);
   }
 
-  multiple_email_make_primary($email);
+  multiple_email_make_primary($email, $account);
   drupal_set_message(t('%email is now your primary e-mail address.', array('%email' => $email->email)));
 
   $form_state['redirect'] = 'user/' . $account->uid . '/edit/email-addresses';