diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index cff6ff0f9..d195cff5b 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -824,7 +824,7 @@ class e_parse extends e_parser
 	/**
 	 * @param $text - template to parse.
 	 * @param boolean $parseSCFiles - parse core 'single' shortcodes
-	 * @param array $extraCodes - support legacy shortcode content (eg. content within .sc) as well as simpleParse array format.
+	 * @param object|array $extraCodes - shortcode class containing sc_xxxxx methods or an array of key/value pairs or legacy shortcode content (eg. content within .sc)
 	 * @param object $eVars - XXX more info needed.
 	 * @return string
 	 */
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index cc1d5391d..4b10e5f44 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -852,7 +852,8 @@ class themeHandler
 		
 		
 	
-		
+		$itext = '';
+
 		
 		// New in 0.8    WORK IN PROGRESS ----
 		if($theme['layouts'])
@@ -1335,9 +1336,30 @@ class themeHandler
 							$itext .= "</td>
 											<td style='vertical-align:top'>";
 							// Default
-							$itext .= ($pref['sitetheme_deflayout'] != $key) ? $custompage_diz."<div class='e-hideme' id='element-to-be-shown-{$key}'><textarea style='width:97%' rows='6' placeholder='usersettings.php' cols='20' name='custompages[".$key."]' >".(isset($pref['sitetheme_custompages'][$key]) ? implode("\n", $pref['sitetheme_custompages'][$key]) : "")."</textarea></div>\n" : TPVLAN_55;
+
+							if($pref['sitetheme_deflayout'] != $key)
+							{
+								$itext .= $custompage_diz."<div class='e-hideme' id='element-to-be-shown-{$key}'>
+										<textarea style='width:97%' rows='6' placeholder='usersettings.php' cols='20' name='custompages[".$key."]' >".(isset($pref['sitetheme_custompages'][$key]) ? implode("\n", $pref['sitetheme_custompages'][$key]) : "")."</textarea>";
+
+
+								//TODO Later.
+							//	$itext .= e107::getForm()->userclass('layoutUserclass['.$key.']',null, null, array('options'=>'public,member,admin,classes,no-excludes','size'=>'xxlarge'));
+
+
+								$itext .= "
+								</div>\n";
+							}
+							else
+							{
+								$itext .= TPVLAN_55;
+							}
+
+
 							
 							$itext .= "</td>";
+
+
 							
 							$itext .= "<td>";
 							
diff --git a/user.php b/user.php
index 0c750b838..4064223c9 100644
--- a/user.php
+++ b/user.php
@@ -258,9 +258,9 @@ if (isset($id))
 	else
 	{
 		// $userList = $sql->db_getList();
-
-		$text = $tp->parseTemplate($USER_SHORT_TEMPLATE_START, TRUE, $user_shortcodes);
 		$sc = e107::getScBatch('user');
+		$text = $tp->parseTemplate($USER_SHORT_TEMPLATE_START, TRUE, $sc);
+
 		foreach ($data as $row)
 		{
 			$loop_uid = $row['user_id'];
@@ -269,9 +269,10 @@ if (isset($id))
 			$sc->setVars($row);
 			$sc->wrapper('user/list');
 
-			$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE, TRUE, $user_shortcodes);
+			$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE, TRUE, $sc);
 		}
-		$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $user_shortcodes);
+
+		$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $sc);
 	}
 
 	$ns->tablerender(LAN_USER_52, $text);