Index: trunk/admin/users/adduser_custom.php
===================================================================
diff -u -N -r738 -r777
--- trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 738)
+++ trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 777)
@@ -161,20 +161,26 @@
       $field =& $objCustomFields->GetItemRefByIndex($i);     
       $fieldid = $field->Get("CustomFieldId");
 
+		$CF=$field->GetAdminUI();
+		if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE)))
+			if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"))))
+				$CF->default_value = $cv->Get("Value");
+
+
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
       $field->Set('FieldLabel', admin_language($field->Get('Prompt')) );
       
       if(is_object($f))
       {
         $val_field = "<input type=\"text\" tabindex=\"".($i+1)."\" VALUE=\"".inp_htmlize($f->Get("Value"))."\" name=\"$fieldname\">";
-        $field->Set("Value", $val_field);
+        $field->Set("Value", $CF->ItemFormElement());
         $field->Set("DataId",$f->Get("CustomDataId"));
       }
       else
       {      
         $val_field = "<input type=\"text\" tabindex=\"".($i+1)."\"  VALUE=\"\" name=\"$fieldname\">";
-        $field->Set("Value", $val_field);
+        $field->Set("Value", $CF->ItemFormElement());
         $field->Set("DataId",0);
       }
   }
@@ -216,6 +222,7 @@
   <input type="hidden" name="ItemId" value="<?php echo $c->Get("ResourceId"); ?>">
   <input type="hidden" name="Action" value="m_edit_custom_data">
   <input type="hidden" name="UserEditStatus" VALUE="0">
+  <input type="hidden" name="CustomType" VALUE="6">
 </FORM>