Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.642
diff -u -F^f -r1.642 user.module
--- modules/user/user.module	29 Jul 2006 17:56:41 -0000	1.642
+++ modules/user/user.module	29 Jul 2006 20:04:36 -0000
@@ -1081,7 +1081,7 @@ function user_pass_reset($uid, $timestam
           // And proceed with normal login, going to user page.
           user_module_invoke('login', $edit, $user);
           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');
+          drupal_goto('user/'. $user->uid .'/edit', 'passreset=1');
         }
         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' => theme('placeholder',$account->name), '%expiration_date' => format_date($timestamp + $timeout))));
@@ -1263,6 +1263,7 @@ function user_edit_form($uid, $edit, $re
     $form['account']['pass'] = array('#type' => 'password_confirm',
       '#title' => t('Password'),
       '#description' => t('To change the current user password, enter the new password in both fields.'),
+      '#required' => $_GET['passreset'];
     );
   }
   elseif ($register && $admin) {