diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index 1f2260e2e..4f9821c96 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-01-07 22:30:19 $
+|     $Revision: 1.6 $
+|     $Date: 2008-01-09 22:44:05 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -24,7 +24,7 @@ if (!getperms("4"))
   exit;
 }
 $e_sub_cat = 'userclass';
-//define('UC_DEBUG_OPTS',FALSE);
+define('UC_DEBUG_OPTS',FALSE);
 require_once("auth.php");
 require_once(e_HANDLER."userclass_class.php");		// Modified class handler
 $uclass = new e_userclass;						// Class management functions - legacy stuff from 0.7
@@ -326,7 +326,7 @@ switch ($action)
 		<tr>
 		<td class='forumheader3'>".UCSLAN_24."</td>
 		<td class='forumheader3'>";
-	  $text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,"nobody,main,admin,classes,matchclass,member").'</select>';
+	  $text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,"nobody,public,main,admin,classes,matchclass,member").'</select>';
 //		.r_userclass("userclass_editclass", $userclass_editclass, "off", "main,admin,classes,matchclass,public,nobody").
 	$text .= "</td>
 		<td class='forumheader3'>".UCSLAN_32."</td>
diff --git a/e107_files/shortcode/batch/signup_shortcodes.php b/e107_files/shortcode/batch/signup_shortcodes.php
index 743800631..067bcc085 100755
--- a/e107_files/shortcode/batch/signup_shortcodes.php
+++ b/e107_files/shortcode/batch/signup_shortcodes.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2007-10-11 19:46:29 $
+|     $Revision: 1.9 $
+|     $Date: 2008-01-09 22:44:13 $
 |     $Author: e107steved $
 |
 | Mods to show extended field categories
@@ -140,19 +140,29 @@ SC_END
 
 
 SC_BEGIN SIGNUP_USERCLASS_SUBSCRIBE
-global $tp, $pref, $sql, $USERCLASS_SUBSCRIBE_START, $USERCLASS_SUBSCRIBE_ROW, $USERCLASS_SUBSCRIBE_END;
+global $pref, $e_userclass, $USERCLASS_SUBSCRIBE_START, $USERCLASS_SUBSCRIBE_END;
 $ret = "";
-$search = array('{USERCLASS_ID}', '{USERCLASS_NAME}', '{USERCLASS_DESCRIPTION}');
-if($pref['signup_option_class'] && ($sql->db_Select("userclass_classes", "*", "userclass_editclass = 0 order by userclass_name")))
+if($pref['signup_option_class'])
 {
-	$ret = $USERCLASS_SUBSCRIBE_START;
-	while($row = $sql->db_Fetch())
-	{
-		$row['userclass_description'] = $tp->toHTML($row['userclass_description'], "", "defs");
-		$row['userclass_name'] = $tp->toHTML($row['userclass_name'], "", "defs");
-		$replace = array($row['userclass_id'], $row['userclass_name'], $row['userclass_description']);
-		$ret .= str_replace($search, $replace, $USERCLASS_SUBSCRIBE_ROW);
-	}
+  if (!is_object($e_userclass))
+  {
+	require_once(e_HANDLER.'userclass_class.php');
+	$e_userclass = new user_class;
+  }
+  $ucList = $e_userclass->get_editable_classes();			// List of classes which this user can edit
+  $ret = '';
+  if(!$ucList) return;
+
+  function show_signup_class($treename, $classnum, $current_value, $nest_level)
+  {
+	global $USERCLASS_SUBSCRIBE_ROW, $e_userclass, $tp;
+	$search = array('{USERCLASS_ID}', '{USERCLASS_NAME}', '{USERCLASS_DESCRIPTION}', '{USERCLASS_INDENT}');
+	$replace = array($classnum, $tp->toHTML($e_userclass->uc_get_classname($classnum), "", "defs"), 
+					$tp->toHTML($e_userclass->uc_get_classdescription($classnum), "", "defs"), " style='text-indent:".(1.2*$nest_level)."em'");
+	return str_replace($search, $replace, $USERCLASS_SUBSCRIBE_ROW);
+  }
+  $ret = $USERCLASS_SUBSCRIBE_START;
+  $ret .= $e_userclass->vetted_tree('class',show_signup_class,'','editable');
 	$ret .= $USERCLASS_SUBSCRIBE_END;
 	return $ret;
 }
diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php
index 30d9a5112..c60964861 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.9 $
-|     $Date: 2008-01-08 22:24:22 $
+|     $Revision: 1.10 $
+|     $Date: 2008-01-09 22:44:05 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -158,9 +158,9 @@ class user_class
   function get_editable_classes($class_list = USERCLASS_LIST)
   {
     $ret = array();
-	$blockers = array(e_UC_PUBLIC => 1, e_UC_READONLY => 1, e_UC_MEMBER => 1);
+	$blockers = array(e_UC_PUBLIC => 1, e_UC_READONLY => 1, e_UC_MEMBER => 1, e_UC_NOBODY => 1, e_UC_GUEST => 1);
 	$possibles = array_flip(explode(',',$class_list));
-	unset($possibles[e_UC_PUBLIC]);
+//	unset($possibles[e_UC_PUBLIC]);
 	unset($possibles[e_UC_READONLY]);
 	foreach ($this->class_tree as $uc => $uv)
 	{
diff --git a/e107_themes/templates/signup_template.php b/e107_themes/templates/signup_template.php
index 2f2c39911..09883a570 100755
--- a/e107_themes/templates/signup_template.php
+++ b/e107_themes/templates/signup_template.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/signup_template.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2007-12-03 21:03:25 $
+|     $Revision: 1.7 $
+|     $Date: 2008-01-09 22:44:19 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -47,7 +47,7 @@ $sc_style['SIGNUP_IS_MANDATORY']['pre'] = "<span style='font-size:15px; color:re
 $sc_style['SIGNUP_IS_MANDATORY']['post'] = "</span>";
 
 
-if(!isset($USERCLASS_SUBSCRIBE_START))
+if(!defined($USERCLASS_SUBSCRIBE_START))
 {
 $USERCLASS_SUBSCRIBE_START = "
 <tr>
@@ -58,21 +58,23 @@ $USERCLASS_SUBSCRIBE_START = "
 ";
 }
 
-if(!isset($USERCLASS_SUBSCRIBE_ROW))
+if(!defined($USERCLASS_SUBSCRIBE_ROW))
 {
 $USERCLASS_SUBSCRIBE_ROW = "
 <tr>
 	<td class='defaulttext' style='width:10%;vertical-align:top'>
+		<div {USERCLASS_INDENT}>
 		<input type='checkbox' name='class[]' value='{USERCLASS_ID}'  />
+		</div>
 	</td>
-	<td class='defaulttext' style='text-align:left;margin-left:0px;width:90%padding-top:3px;vertical-align:top'>{USERCLASS_NAME}<br />
+	<td class='defaulttext' style='text-align:left;margin-left:0px;width:90%;padding-top:3px;vertical-align:top'>{USERCLASS_NAME}<br />
 		<span class='smalltext'>{USERCLASS_DESCRIPTION}</span>
 	</td>
 </tr>
 ";
 }
 
-if(!isset($USERCLASS_SUBSCRIBE_END))
+if(!defined($USERCLASS_SUBSCRIBE_END))
 {
 $USERCLASS_SUBSCRIBE_END = "
 </table>
@@ -83,13 +85,13 @@ $USERCLASS_SUBSCRIBE_END = "
 
 
 
-if(!isset($SIGNUP_PASSWORD_LEN))
+if(!defined($SIGNUP_PASSWORD_LEN))
 {
 $SIGNUP_PASSWORD_LEN = "<span class='smalltext'> (".LAN_SIGNUP_1." {$pref['signup_pass_len']} ".LAN_SIGNUP_2.")</span>";
 }
 
 
-if(!isset($SIGNUP_EXTENDED_USER_FIELDS))
+if(!defined($SIGNUP_EXTENDED_USER_FIELDS))
 {
 	$SIGNUP_EXTENDED_USER_FIELDS	= "
 <tr>
@@ -104,7 +106,7 @@ if(!isset($SIGNUP_EXTENDED_USER_FIELDS))
 ";
 }
 
-if(!isset($EXTENDED_USER_FIELD_REQUIRED))
+if(!defined($EXTENDED_USER_FIELD_REQUIRED))
 {
 	$EXTENDED_USER_FIELD_REQUIRED	= "<span style='text-align:right;font-size:15px; color:red'> *</span>";
 }
@@ -154,7 +156,7 @@ $sc_style['SIGNUP_IMAGECODE']['post'] = "
 ";
 
 
-if(!isset($COPPA_TEMPLATE))
+if(!defined($COPPA_TEMPLATE))
 {
 $COPPA_TEMPLATE = LAN_109." <a href='http://www.cdt.org/legislation/105th/privacy/coppa.html'>".LAN_SIGNUP_14."</a>. ".LAN_SIGNUP_15." <a href='mailto:".SITEADMINEMAIL."'>".LAN_SIGNUP_14."</a> ".LAN_SIGNUP_16."
 <br />
@@ -165,19 +167,19 @@ $COPPA_TEMPLATE = LAN_109." <a href='http://www.cdt.org/legislation/105th/privac
 ";
 }
 
-if(!isset($COPPA_FAIL))
+if(!defined($COPPA_FAIL))
 {
 $COPPA_FAIL = "<div style='text-align:center'>".LAN_SIGNUP_9."</div>";
 }
 
-if(!isset($SIGNUP_TEXT))
+if(!defined($SIGNUP_TEXT))
 {
 $SIGNUP_TEXT =
 LAN_309." <b>".LAN_SIGNUP_29."</b><br /><br />".LAN_SIGNUP_30."<br />
 ";
 }
 
-if(!isset($SIGNUP_XUP_FORM))
+if(!defined($SIGNUP_XUP_FORM))
 {
 $SIGNUP_XUP_FORM = "
 	<div id='xup' style='display:none' >
@@ -233,7 +235,7 @@ $SIGNUP_XUP_FORM = "
 ";
 }
 
-if (!isset($SIGNUP_XUP_BUTTON))
+if (!defined($SIGNUP_XUP_BUTTON))
 {
 $SIGNUP_XUP_BUTTON = "	<div style='padding:10px;text-align:center'>
 	<input class='button' type ='button' style='cursor:pointer' size='30' value=\"".LAN_SIGNUP_35."\" onclick=\"expandit('default');expandit('xup')\" />
@@ -242,7 +244,7 @@ $SIGNUP_XUP_BUTTON = "	<div style='padding:10px;text-align:center'>
 }
 
 
-if(!isset($SIGNUP_BEGIN))
+if(!defined($SIGNUP_BEGIN))
 {
 $SIGNUP_BEGIN = "
 {SIGNUP_FORM_OPEN}
@@ -252,7 +254,7 @@ $SIGNUP_BEGIN = "
 ".LAN_400."<br /><br /></div>";
 }
 
-if(!isset($SIGNUP_BODY))
+if(!defined($SIGNUP_BODY))
 {
 $SIGNUP_BODY = "
 {SIGNUP_XUP}
@@ -320,7 +322,7 @@ $SIGNUP_BODY = "
 }
 
 
-if(!isset($SIGNUP_EXTENDED_CAT))
+if(!defined($SIGNUP_EXTENDED_CAT))
 {
 	$SIGNUP_EXTENDED_CAT	= "
 <tr>
@@ -332,7 +334,7 @@ if(!isset($SIGNUP_EXTENDED_CAT))
 }
 
 
-if(!isset($SIGNUP_END))
+if(!defined($SIGNUP_END))
 {
 $SIGNUP_END = "
 ";