=== modified file 'signup_status/modules/signup_status_mailer/signup_status_mailer.module'
--- signup_status/modules/signup_status_mailer/signup_status_mailer.module	2009-09-28 10:57:59 +0000
+++ signup_status/modules/signup_status_mailer/signup_status_mailer.module	2009-10-27 10:29:13 +0000
@@ -94,12 +94,15 @@ function signup_status_mailer_nodeapi(&$
 function signup_status_mailer_signup_status($action, $signup) {
   $params = array();
   $node = node_load($signup->nid);
+  $user_mail = _signup_get_email($signup);
+  $user_name = _signup_get_username($signup);
+  $account = user_load($signup->uid);
 
   // See if there are any admin notifications configured for this site.
   $notify_emails = variable_get('signup_status_mailer_admin_notify_emails', array());
   if (!empty($notify_emails)) {
     $params['node'] = $node;
-    $params['account'] = $account = user_load($signup->uid);
+    $params['account'] = $account;
     $params['signup'] = $signup;
     $params['subject'] = variable_get('signup_status_mailer_admin_notify_subject', '');
     $params['body'] = variable_get('signup_status_mailer_admin_notify_body', '');
@@ -132,9 +135,6 @@ function signup_status_mailer_signup_sta
     $mail_key .= '_default';
   }
 
-  if (empty($account)) {
-    $account = user_load($signup->uid);
-  }
   $language = user_preferred_language($account);
   if (empty($params)) {
     $params['node'] = $node;
@@ -145,11 +145,11 @@ function signup_status_mailer_signup_sta
   $params['body'] = $settings['body'];
 
   // Actually try to send it and log what happened.
-  if (drupal_mail('signup_status_mailer', $mail_key, $account->mail, $language, $params)) {
-    watchdog('signup_status_mail', 'Signup status message sent to %name at %mail for %action %status', array('%name' => $account->name, '%mail' => $account->mail, '%action' => $action, '%status' => $status_name), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid .'/signups'));
+  if (drupal_mail('signup_status_mailer', $mail_key, $user_mail, $language, $params)) {
+    watchdog('signup_status_mail', 'Signup status message sent to %name at %mail for %action %status', array('%name' => $user_name, '%mail' => $user_mail, '%action' => $action, '%status' => $status_name), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid .'/signups'));
   }
   else {
-    watchdog('signup_status_mail', 'Error sending signup status message to %name at %mailfor %action %status', array('%name' => $account->name, '%mail' => $mail, '%action' => $action, '%status' => $status_name), WATCHDOG_ERROR, l(t('view'), 'node/'. $node->nid .'/signups'));
+    watchdog('signup_status_mail', 'Error sending signup status message to %name at %mail for %action %status', array('%name' => $user_name, '%mail' => $user_mail, '%action' => $action, '%status' => $status_name), WATCHDOG_ERROR, l(t('view'), 'node/'. $node->nid .'/signups'));
   }
 }