diff --git a/modules/contact.module b/modules/contact.module
index af129f48b10..35e5be853e3 100644
--- a/modules/contact.module
+++ b/modules/contact.module
@@ -102,7 +102,7 @@ function contact_mail_user() {
         if (!$edit['subject']) {
           form_set_error('subject', t('You must enter a subject.'));
         }
-        form_validate($edit, $edit['mail'] . $user->name . $user->mail);
+        form_validate($edit, $user->name . $user->mail);
 
         if (!form_get_errors()) {
           // Compose the body:
@@ -155,7 +155,7 @@ function contact_mail_user() {
       $output .= form_textfield(t('Subject'), 'subject', $edit['subject'], 60, 50, NULL, NULL, TRUE);
       $output .= form_textarea(t('Message'), 'message', $edit['message'], 60, 15, NULL, NULL, TRUE);
       $output .= form_checkbox(t('Send me a copy.'), 'copy', $edit['copy']);
-      $output .= form_token($edit['mail'] . $user->name . $user->mail);
+      $output .= form_token($user->name . $user->mail);
       $output .= form_submit(t('Send e-mail'));
       $output  = form($output);
     }
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index af129f48b10..35e5be853e3 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -102,7 +102,7 @@ function contact_mail_user() {
         if (!$edit['subject']) {
           form_set_error('subject', t('You must enter a subject.'));
         }
-        form_validate($edit, $edit['mail'] . $user->name . $user->mail);
+        form_validate($edit, $user->name . $user->mail);
 
         if (!form_get_errors()) {
           // Compose the body:
@@ -155,7 +155,7 @@ function contact_mail_user() {
       $output .= form_textfield(t('Subject'), 'subject', $edit['subject'], 60, 50, NULL, NULL, TRUE);
       $output .= form_textarea(t('Message'), 'message', $edit['message'], 60, 15, NULL, NULL, TRUE);
       $output .= form_checkbox(t('Send me a copy.'), 'copy', $edit['copy']);
-      $output .= form_token($edit['mail'] . $user->name . $user->mail);
+      $output .= form_token($user->name . $user->mail);
       $output .= form_submit(t('Send e-mail'));
       $output  = form($output);
     }