--- uc_signup.module	2009-08-13 13:21:28.000000000 -0400
+++ uc_signupNEW.module	2009-08-22 23:57:18.000000000 -0400
@@ -81,17 +81,18 @@ function uc_signup_attendees_form_emails

   foreach ($events as $event) {
     // TODO: This should call theme('uc_signup_event_text'
-    $node = node_load($event['nid']);
+    $nid  = $event['nid'];
+    $node = node_load($nid);
     $date_field = signup_date_field($node->type);
     $date_field_name = $date_field['field_name'];
     $this_date_field = $node->$date_field_name;
     $date_formatted = strip_tags(content_format($date_field, $this_date_field[0]));
-    $num = 0;
+
     $form['instructions'] = array(
       '#type' => 'markup',
       '#value' => t("Please enter the email address of each attendee for this event. If an attendee does not have an account on this site, you'll be prompted to enter some information about that attendee."),
     );
-    $form[$event['nid']] = array(
+    $form[$nid] = array(
       '#type' => 'fieldset',
       '#title' => check_plain($node->title) .' - '. $date_formatted,
       '#collapsible' => TRUE,
@@ -99,13 +100,17 @@ function uc_signup_attendees_form_emails
       '#tree' => TRUE,
     );

+    $num = 0;
     while ($num < $event['qty']) {
-      $default = $form_state['values'][$event['nid']][$num];
+      $default = $form_state['values'][$nid][$num];
       if (empty($default)) {
-        $default = $_SESSION['uc_signup']['nids'][$event['nid']][$num];
+        $default = $_SESSION['uc_signup']['nids'][$nid][$num];
+      }
+      if ($num == 0 && empty($default)) {
+        $default = $user->mail;
       }
-      // TODO: Prepop with current user email on first view.
-      $form[$event['nid']][$num] = array(
+
+      $form[$nid][$num] = array(
         '#type' => 'textfield',
         '#title' => t('Email Address of Attendee #%count', array('%count' => $num + 1)),
         '#default_value' => $default,