Index: admin_menu.module
===================================================================
--- admin_menu.module	(Revision 104)
+++ admin_menu.module	(Arbeitskopie)
@@ -312,10 +312,13 @@ function admin_menu_add_item(&$_admin_me
  */
 function admin_menu_admin_menu(&$admin_menu, $may_cache) {
   if (!$may_cache) {
-    // Add anonymous/authenticated users counter.
+    // 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));
+
     $mid_admin  = $admin_menu['index']['admin'];
-    $count_anon = db_result(db_query("SELECT COUNT(uid) FROM {sessions} WHERE uid = 0 AND timestamp >= %d", time() - 30 * 60));
-    $count_auth = db_result(db_query("SELECT COUNT(DISTINCT uid) FROM {sessions} WHERE uid > 0 AND timestamp >= %d", time() - 30 * 60));
     $title = t('Current anonymous / authenticated users');
     $icon_users = '<img src="'. base_path() . drupal_get_path('module', 'admin_menu') .'/images/icon_users.png" width="16" height="15" alt="'. $title .'" title="'. $title .'" />';
     admin_menu_add_item($admin_menu, $mid_admin, array(