diff -wBNru /var/www/drupal-clean/modules/user/user.pages.inc /var/www/drupal/user/user.pages.inc
--- /var/www/drupal-clean/modules/user/user.pages.inc   2009-09-16 13:54:20.000000000 -0400
+++ /var/www/drupal/user/user.pages.inc 2009-12-07 16:38:15.000000000 -0500
@@ -114,14 +115,26 @@
           // user_authenticate_finalize() also updates the login timestamp of the
           // user, which invalidates further use of the one-time login link.
           user_authenticate_finalize($form_state['values']);
-          drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
-          drupal_goto('user/'. $user->uid .'/edit');
+
+          // <!-- PATCH
+          //drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
+          //drupal_goto('user/'. $user->uid .'/edit');
+          // PATCH --->
+
+          drupal_goto('user/' . $user->uid);
         }
         else {
           $form['message'] = array('#value' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to login to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
           $form['help'] = array('#value' => '<p>'. t('This login can be used only once.') .'</p>');
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
           $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
+
+          // <!-- PATCH
+          $form['reset_uid'] = array('#type' => 'value', '#default_value' => $uid);
+
+          //drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
+          //drupal_goto('user/'. $user->uid .'/edit');
+          // PATCH --->
           return $form;
         }
       }