diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 85a5452f0a..f06a4f6e1a 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -417,6 +417,9 @@ function local_user_get_groups($user, $all = false) {
 				if (in_array($user['uid'], $group['member']))
 					$groups[] = $group['name'];
 
+	if ( $all )
+		$groups[] = "all";
+
 	sort($groups);
 
 	return $groups;
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index 8b5c3c3793..37c5ec3a84 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -412,6 +412,9 @@ function presubmit() {
 								$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png";
 							else
 								$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png";
+							$groupcount = count($group['member']);
+							if ($group["name"] == "all")
+								$groupcount = count($config['system']['user']);
 					?>
 					<tr ondblclick="document.location='system_groupmanager.php?act=edit&id=<?=$i;?>'">
 						<td class="listlr">
@@ -431,7 +434,7 @@ function presubmit() {
 							<?=htmlspecialchars($group['description']);?>&nbsp;
 						</td>
 						<td class="listbg">
-							<?=count($group['member'])?>
+							<?=$groupcount;?>
 						</td>
 						<td valign="middle" nowrap class="list">
 							<a href="system_groupmanager.php?act=edit&id=<?=$i;?>">