Index: trunk/admin/users/adduser_custom.php
===================================================================
diff -u -r2853 -r4077
--- trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 2853)
+++ trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 4077)
@@ -35,6 +35,8 @@
     }
 }
 unset($objEditItems);
+$application->SetVar('u_mode', 't');
+
 $objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
@@ -112,11 +114,10 @@
       $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");
+		if (is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE))) {
+			$CF->default_value = $c->GetCustomFieldValue(substr($CF->name,1), '', 0, true);
+		}
 
-
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
       $field->Set('FieldLabel', admin_language($field->Get('Prompt')) );