Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r3895 -r4077
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 3895)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 4077)
@@ -29,6 +29,7 @@
 $objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
+$application->SetVar('u_mode', 't');
 $objCustomFields = new clsCustomFieldList(6);
 $objRelList = new clsRelationshipList();
 $objImages = new clsImageList();
@@ -44,7 +45,7 @@
     $action = "m_add_user";
     $objUsers->CreateEmptyEditTable("PortalUserId");
     $objRelList->CreateEmptyEditTable("RelationshipId");
-    $objCustomDataList->CreateEmptyEditTable("CustomDataId");
+    $objCustomDataList->CreateEmptyEditTable('u');
     $objImages->CreateEmptyEditTable("ResourceId");  
     $objUserGroupsList->CreateEmptyEditTable("PortalUserId");
     
@@ -75,7 +76,7 @@
         $user_ids[] = $u->Get("PortalUserId");
         $ids = $objEditItems->GetResourceIDList();
         $objRelList->CopyToEditTable("SourceId",$ids);
-        $objCustomDataList->CopyToEditTable("ResourceId",$ids);
+        $objCustomDataList->CopyToEditTable('u', $ids);
         $objImages->CopyToEditTable("ResourceId",$ids);
         $objUserGroupsList->CopyToEditTable("PortalUserId", $user_ids);
     }
@@ -335,42 +336,31 @@
         {
         	$n = substr($f->name,1); // TabIndex
         	$cfield = $objCustomFields->GetItemByField('FieldName',$n,FALSE);
-        	if(is_object($cfield))
-        	{
-        		$cv = $objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"));
-        		if(is_object($cv))
-        		{
-        	      $f->default_value = $cv->Get("Value");
-        		}
+        	if (is_object($cfield)) {
+				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
             
             print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";       
-            if(is_object($f->NextItem))
-            {
+            if (is_object($f->NextItem)) {
                 $n = $f->NextItem;
                 print "  <td>".$n->ItemFormElement(17)."</TD>";       
             }
-            else
-              print "  <td><span class=\"text\">&nbsp;</span></td>\n";
+            else {
+              	print "  <td><span class=\"text\">&nbsp;</span></td>\n";
+            }
             print "</tr>\n";
         }
     }
   }
   $objCustomDataList->SetTable('live');
 }
 ?>
-  <tr <?php int_table_color(); ?>> 
-    <td colspan="3"> 
-	  <input type="hidden" name="Action" value="<?php echo $action; ?>">
+</table>
+<input type="hidden" name="Action" value="<?php echo $action; ?>">
 	  <input type="hidden" name="user_id" value="<?php echo $c->Get("PortalUserId"); ?>">
       <input type="hidden" name="UserEditStatus" VALUE="0">
-   </td>
-  </tr>
-    </td>
-  </tr>
-</table>
 </form>
 <script src="<?php echo $adminURL; ?>/include/calendar.js"></script>
 <SCRIPT language="JavaScript">