Index: branches/5.1.x/core/units/groups/groups_event_handler.php
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 13086)
+++ branches/5.1.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_event_handler.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: groups_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -38,8 +38,11 @@
 								FROM ' . $table_name . '
 								WHERE PortalUserId = ' . (int)$user_id;
 						$group_ids = $this->Conn->GetCol($sql);
-						array_push($group_ids, 14, 15); // Guest & Everyone groups are set dynamically
 
+						// add system groups
+						array_push($group_ids, $this->Application->ConfigValue('User_GuestGroup')); // Guest
+						array_push($group_ids, $this->Application->ConfigValue('User_LoggedInGroup')); // Everyone
+
 						$object->addFilter('already_member_filter', '%1$s.GroupId NOT IN ('.implode(',', $group_ids).')');
 					}
 					break;