diff --git a/modules/user.module b/modules/user.module
index 602b2ea19eed..93d6d95709f1 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -400,16 +400,19 @@ function user_block($op = "list", $delta = 0) {
           }
 
           if (user_access("access user list") && $total_users) {
-            /* Display a list of currently online users */
+            // Display a list of currently online users
             $max_users = variable_get("user_block_max_list_count", 10);
             $items = array();
-            while ($uid = db_fetch_object($users)) {
+            while (($max_users--) && $uid = db_fetch_object($users)) {
               $items[] = format_name(user_load(array("uid" => $uid->uid)));
             }
 
             if ($items) {
               $output .= "<br /><br />";
               $output .= theme("item_list", $items, t("Online users:"));
+              if(db_fetch_object($users)) {
+                $output .= "<br />...";
+              }
             }
           }
         }
diff --git a/modules/user/user.module b/modules/user/user.module
index 602b2ea19eed..93d6d95709f1 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -400,16 +400,19 @@ function user_block($op = "list", $delta = 0) {
           }
 
           if (user_access("access user list") && $total_users) {
-            /* Display a list of currently online users */
+            // Display a list of currently online users
             $max_users = variable_get("user_block_max_list_count", 10);
             $items = array();
-            while ($uid = db_fetch_object($users)) {
+            while (($max_users--) && $uid = db_fetch_object($users)) {
               $items[] = format_name(user_load(array("uid" => $uid->uid)));
             }
 
             if ($items) {
               $output .= "<br /><br />";
               $output .= theme("item_list", $items, t("Online users:"));
+              if(db_fetch_object($users)) {
+                $output .= "<br />...";
+              }
             }
           }
         }