diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index 75a35a1f1..ded022f94 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
-|     $Revision: 1.17 $
-|     $Date: 2008-11-29 23:31:02 $
-|     $Author: secretr $
+|     $Revision: 1.18 $
+|     $Date: 2008-12-07 16:37:37 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -310,7 +310,7 @@ switch ($action)
 	$userclass_description = '';
 	$userclass_editclass = e_UC_ADMIN;
 	$userclass_visibility = e_UC_ADMIN;
-	$userclass_parent = e_UC_PUBLIC;
+	$userclass_parent = e_UC_NOBODY;
 	$userclass_icon = '';
 	$userclass_type = UC_TYPE_STD;
 	$userclass_groupclass = '';
diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php
index cfe8ad55c..dc5210b34 100644
--- a/e107_handlers/userclass_class.php
+++ b/e107_handlers/userclass_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
-|     $Revision: 1.21 $
-|     $Date: 2008-11-29 21:16:48 $
+|     $Revision: 1.22 $
+|     $Date: 2008-12-07 16:37:37 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -1029,7 +1029,16 @@ class user_class_admin extends user_class
   function add_new_class($classrec)
   {
 //    echo "Add new class<br />";
-    $this->sql_r->db_Insert('userclass_classes',$this->copy_rec($classrec, TRUE));
+	if ($classrec['userclass_type'] == UC_TYPE_GROUP)
+	{	// Need to make sure our ID is in the accumulation array
+		$temp = explode(',',$classrec['userclass_accum']);
+		if (!in_array($classrec['userclass_id'], $temp))
+		{
+			$temp[] = $classrec['userclass_id'];
+			$classrec['userclass_accum'] = implode(',',$temp);
+		}
+	}
+	$this->sql_r->db_Insert('userclass_classes',$this->copy_rec($classrec, TRUE));
 	$this->clearCache();
   }
   
@@ -1044,6 +1053,16 @@ class user_class_admin extends user_class
 	}
     $qry = '';
 	$spacer = '';
+	if ($classrec['userclass_type'] == UC_TYPE_GROUP)
+	{	// Need to make sure our ID is in the accumulation array
+		$temp = explode(',',$classrec['userclass_accum']);
+		if (!in_array($classrec['userclass_id'], $temp))
+		{
+			$temp[] = $classrec['userclass_id'];
+			$classrec['userclass_accum'] = implode(',',$temp);
+		}
+	}
+
 	foreach ($this->field_list as $fl => $val)
 	{
 	  if (isset($classrec[$fl]))