Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.18
diff -u -p -r1.18 user.admin.inc
--- modules/user/user.admin.inc	16 Jan 2008 22:54:41 -0000	1.18
+++ modules/user/user.admin.inc	14 May 2008 19:46:05 -0000
@@ -233,6 +233,7 @@ function user_admin_settings() {
   $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings'));
   $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
   $form['registration']['user_email_verification'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification when a visitor creates an account'), '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.'));
+  $form['registration']['user_access_admin_clobber'] = array('#type' => 'checkbox', '#title' => t('Ensure that "Last Access" is set for administrative creates and edits.'), '#default_value' => variable_get('user_access_admin_clobber', FALSE), '#description' => t('If this box is checked, the users "Last Access" column will be set to a value representing the time of add or edit.  This will allow the user to be seen by the blocks containing user data such as "Who\'s New".')); // @see http://drupal.org/node/171117
   $form['registration']['user_registration_help'] = array('#type' => 'textarea', '#title' => t('User registration guidelines'), '#default_value' => variable_get('user_registration_help', ''), '#description' => t('This text is displayed at the top of the user registration form and is useful for helping or instructing your users.'));
 
   // User e-mail settings.
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.892.2.2
diff -u -p -r1.892.2.2 user.module
--- modules/user/user.module	9 Apr 2008 21:11:51 -0000	1.892.2.2
+++ modules/user/user.module	14 May 2008 19:46:05 -0000
@@ -216,7 +216,8 @@ function user_save($account, $array = ar
     $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
     // Consider users edited by an administrator as logged in, if they haven't
     // already, so anonymous users can view the profile (if allowed).
-    if (empty($array['access']) && empty($account->access) && user_access('administer users')) {
+    // @see http://drupal.org/node/171117
+    if (empty($array['access']) && empty($account->access) && user_access('administer users') && variable_get('user_access_admin_clobber', FALSE)) {
       $array['access'] = time();
     }
     foreach ($array as $key => $value) {
@@ -292,7 +293,8 @@ function user_save($account, $array = ar
     }
     // Consider users created by an administrator as already logged in, so
     // anonymous users can view the profile (if allowed).
-    if (empty($array['access']) && user_access('administer users')) {
+    // @see http://drupal.org/node/171117
+    if (empty($array['access']) && user_access('administer users') && variable_get('user_access_admin_clobber', FALSE)) {
       $array['access'] = time();
     }
 
