--- signup.module.eventpatch.1	2007-04-02 15:05:14.272387125 +0200
+++ signup.module	2007-04-02 15:04:09.494042910 +0200
@@ -243,7 +243,7 @@ function signup_form_alter($form_id, &$f
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
       );
-      $form['signup']['_signup_admin_form'] = _signup_admin_form($node);
+      $form['signup']['_signup_admin_form'] = _signup_admin_form($node,TRUE);
       return $form;
     }
     elseif (user_access('admin signups')) {
@@ -694,7 +694,7 @@ function signup_settings_page() {
   $form['signup_close_early'] = array('#type' => 'textfield', '#title' => t('Close x hours before'), '#default_value' => variable_get('signup_close_early', 1), '#size' => 5, '#maxlength' => 10, '#description' => t('The number of hours before the event which signups will no longer be allowed. Use negative numbers to close signups after the event start (example: -12).'));
   $form['title'] = array('#type' => 'markup', '#value' => '<h2>' . t('Default signup information') . '</h2><br>' . t('New signup nodes will start with these settings'));
   $form['group'] = array('#type' => 'fieldset', '#title' => t('Sign up settings'));
-  $form['group']['_signup_admin_form'] = _signup_admin_form($node);
+  $form['group']['_signup_admin_form'] = _signup_admin_form($node,FALSE);
 
   return system_settings_form($form);
 }
@@ -1017,20 +1017,33 @@ function signup_validate_anon_email($nid
  */
 
 /**
- * Returns the signup admin form to either the settings page or the node edit page
+ * Returns the signup admin form to either the settings page or the node edit
+ * page
+ * $translate indicates if the %eventowner should be translated to the current
+ * user or not (ie if this is the admin/settings page, leave the %eventowner
+ * alone.
+ * 
  * @ingroup signup_internal
  */
-function _signup_admin_form($node) {
+function _signup_admin_form($node,$translate) {
 
   //load the default admin form data for new nodes
   if(!$node) {
     global $user;
     $result = db_fetch_object(db_query("SELECT * FROM {signup} WHERE nid = 0"));
-//    $node->signup_forwarding_email = $result->forwarding_email;
+
     $trans = array("%eventowner" => $user->mail); // 
                                                   //allow event owner to be
                                                   //automatically used as email address
-    $node->signup_forwarding_email = strtr($result->forwarding_email, $trans);
+    if ($translate) {                             // 
+                                                  // 
+                                                  // Only translate if we are
+                                                  // not the settings page
+      $node->signup_forwarding_email = strtr($result->forwarding_email, $trans);
+    } else {
+      $node->signup_forwarding_email = $result->forwarding_email;
+    }
+    
     $node->signup_send_confirmation = $result->send_confirmation;
     $node->signup_confirmation_email = $result->confirmation_email;
     $node->signup_send_reminder  = $result->send_reminder;