--- admin_menu.module	2008-09-09 10:39:01.000000000 -0400
+++ admin_menu_new.module	2008-10-05 14:19:21.000000000 -0400
@@ -274,18 +274,26 @@ function admin_menu_translated_menu_link
     $item['title'] = t($item['title'], $item['options']['t'] + array('@username' => $GLOBALS['user']->name));
   }
   if ($item['title'] == 'icon_users') {
-    // Add count of active anonymous/authenticated users.
-    // @see user_block(), user.module
-    $interval = time() - variable_get('user_block_seconds_online', 900);
-    $count_anon = sess_count($interval);
-    $count_auth = db_result(db_query("SELECT COUNT(DISTINCT uid) FROM {sessions} WHERE uid > 0 AND timestamp >= %d", $interval));
-    $icon_users = '<img src="'. base_path() . drupal_get_path('module', 'admin_menu') .'/images/icon_users.png" width="16" height="15" alt="@title" title="@title" />';
-
-    $title = array('@title' => t('Current anonymous / authenticated users'));
-    $icon_users = strtr($icon_users, $title);
-    $item['title'] = t('@count-anon / @count-auth !icon', array('@count-anon' => $count_anon, '@count-auth' => $count_auth, '!icon' => $icon_users));
-    if (user_access('administer users')) {
-      $item['href'] = 'admin/user/user';
+    $url = request_uri();
+    global $user;
+    if (strpos($url, "admin/user/user")) {
+            $item['title']= t('Users');
+    } elseif (!$user->uid) {
+            $item['title']= t('Login');
+    } else {
+      // Add count of active anonymous/authenticated users.
+      // @see user_block(), user.module
+      $interval = time() - variable_get('user_block_seconds_online', 900);
+      $count_anon = sess_count($interval);
+      $count_auth = db_result(db_query("SELECT COUNT(DISTINCT uid) FROM {sessions} WHERE uid > 0 AND timestamp >= %d", $interval));
+      $icon_users = '<img src="'. base_path() . drupal_get_path('module', 'admin_menu') .'/images/icon_users.png" width="16" height="15" alt="@title" title="@title" />';
+  
+      $title = array('@title' => t('Current anonymous / authenticated users'));
+      $icon_users = strtr($icon_users, $title);
+      $item['title'] = t('@count-anon / @count-auth !icon', array('@count-anon' => $count_anon, '@count-auth' => $count_auth, '!icon' => $icon_users));
+      if (user_access('administer users')) {
+        $item['href'] = 'admin/user/user';
+      }
     }
   }
 }