diff --git a/src/etc/config.xml.sample b/src/etc/config.xml.sample
index 8bee6fe52..80da3fddb 100644
--- a/src/etc/config.xml.sample
+++ b/src/etc/config.xml.sample
@@ -192,12 +192,6 @@
 		<domain>localdomain</domain>
 		<dnsserver/>
 		<dnsallowoverride/>
-		<group>
-			<name>all</name>
-			<description><![CDATA[All Users]]></description>
-			<scope>system</scope>
-			<gid>1998</gid>
-		</group>
 		<group>
 			<name>admins</name>
 			<description><![CDATA[System Administrators]]></description>
diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php
index 36bad5b97..05785412e 100644
--- a/src/www/system_groupmanager.php
+++ b/src/www/system_groupmanager.php
@@ -140,8 +140,7 @@ if (isset($_POST['save'])) {
 
         if (empty($_POST['members'])) {
             unset($group['member']);
-        } elseif ($group['gid'] != 1998) {
-        // all group
+        } else {
             $group['member'] = $_POST['members'];
         }
 
@@ -301,10 +300,6 @@ function presubmit() {
                                         <?=gettext("Group description, for your own information only");?>
                                     </td>
                                 </tr>
-						<?php
-                        if ($pconfig['gid'] != 1998) :
-// all users group
-                        ?>
                         <tr>
                             <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td>
                             <td width="78%" class="vtable" align="center">
@@ -375,7 +370,6 @@ function presubmit() {
                             </td>
                         </tr>
 					<?php
-                        endif;
                         if ($act != "new") :
                     ?>
                             <th colspan="2" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></th>
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 357d86d9d..124f96a77 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -606,10 +606,6 @@ function import_ldap_users() {
 				<?php
                                                 $rowIndex = 0;
                 foreach ($config['system']['group'] as $group) :
-                    if ($group['gid'] == 1998) {
-/* all users group */
-                        continue;
-                    }
                     if (is_array($pconfig['groups']) && in_array($group['name'], $pconfig['groups'])) {
                         continue;
                     }
@@ -645,10 +641,6 @@ function import_ldap_users() {
                                                 $rowIndex = 0;
                 if (is_array($pconfig['groups'])) :
                     foreach ($config['system']['group'] as $group) :
-                        if ($group['gid'] == 1998) {
-/* all users group */
-                            continue;
-                        }
                         if (!in_array($group['name'], $pconfig['groups'])) {
                             continue;
                         }