--- invite.module.old	2006-02-17 13:43:42.000000000 +0000
+++ invite.module	2006-02-17 14:11:27.000000000 +0000
@@ -157,8 +157,8 @@
 
         // Add items to the registration form.
 
-        $output .= form_textfield('Registration Code', 'invite_code', '', 30, 64, 'If you are signing up because you received an invitation email, type the registration code found near the bottom of the email.', $attributes = NULL, $required = FALSE);
-        $output .= form_textfield('Email', 'invite_email', '', 30, 64, 'Enter the email address where you received your invitation. ', $attributes = NULL, $required = FALSE);
+        $output .= form_textfield('Registration Code', 'invite_code', $_GET['code'], 30, 64, 'If you are signing up because you received an invitation email, type the registration code found near the bottom of the email.', $attributes = NULL, $required = FALSE);
+        $output .= form_textfield('Email', 'invite_email', $_GET['e-mail'], 30, 64, 'Enter the email address where you received your invitation. ', $attributes = NULL, $required = FALSE);
 
         return array(
                 array('title' => t('Registration Code'),
@@ -368,10 +368,11 @@
     $body .= strip_tags(br2nl(feature_listing()))."\n\n";
   }
 
-  $body .= "To sign up, follow the link below and enter the following information into the 'Registration Code' section of the form\n\n";             
+  $body .= "To sign up, follow the link below:\n\n";             
+  $body .= "Register Here : ". $base_url."/user/register?code=" . $code . "&e-mail=" . $email ."\n\n";
+  $body .= "If you have problems with the above link please go to " . $base_url . " and enter the following information when registering for the site.\n\n";
   $body .= "Your usercode : ".$code."\n";
   $body .= "Your email address : ".$email."\n"; 
-  $body .= "Register Here : ". $base_url."/user/register";
   
   switch ($op){
     case "mail":