diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index 2d663293d..19ac3cf33 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -414,13 +414,10 @@ class users_ext
 	{
         global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action,$frm;
 
-  //		$catList = $ue->user_extended_get_categories();
-  //		$catList[0][0] = array('user_extended_struct_name' => EXTLAN_36);
-  //		$catNums = array_keys($catList);
 		$extendedList = $ue->user_extended_get_fields();
 
-        $emessage = &eMessage::getInstance();
-	  	$text = $emessage->render()  ;
+        $emessage = e107::getMessage();
+	  	$text = $emessage->render();
 
 		$mode = 'show';
 			$text .= "
@@ -465,7 +462,7 @@ class users_ext
 							$text .= "
 							<tr>
 							<td>{$ext['user_extended_struct_name']}</td>
-							<td>".$tp->toHTML($ext['user_extended_struct_text'], FALSE, "defs")."</td>
+							<td>".$tp->toHTML(deftrue($ext['user_extended_struct_text'], $ext['user_extended_struct_text']), FALSE, "defs")."</td>
 							<td class='left'>".$ue->user_extended_edit($ext,$uVal)."</td>
 							<td class='left'>".$category_name."</td>
 							<td>".($ext['user_extended_struct_required'] == 1 ? LAN_YES : LAN_NO)."</td>
diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php
index d3917487b..15fcc2602 100644
--- a/e107_handlers/user_extended_class.php
+++ b/e107_handlers/user_extended_class.php
@@ -569,6 +569,7 @@ class e107_user_extended
 		  foreach($choices as $choice)
 		  {
 			$choice = trim($choice);
+			$choice = deftrue($choice, $choice);
 			$chk = ($curval == $choice)? " checked='checked' " : "";
 			$ret .= "<input {$include} type='radio' name='{$fname}' value='{$choice}' {$chk} /> {$choice}";
 		  }
@@ -588,6 +589,7 @@ class e107_user_extended
             	$val = $choice;
 				$label = $choice;
 			}
+			$label = deftrue($label, $label);
 			$chk = ($curval == $val)? " checked='checked' " : "";
 			$ret .= "<input {$include} type='checkbox' name='{$fname}[]' value='{$val}' {$chk} /> {$label}<br />";
 		  }
@@ -600,6 +602,7 @@ class e107_user_extended
 		  foreach($choices as $choice)
 		  {
 			$choice = trim($choice);
+			$choice = deftrue($choice, $choice);
 			$sel = ($curval == $choice) ? " selected='selected' " : "";
 			$ret .= "<option value='{$choice}' {$sel}>{$choice}</option>\n";
 		  }