Index: trunk/admin/users/adduser.php
===================================================================
diff -u -r3282 -r3895
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 3282)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 3895)
@@ -177,94 +177,136 @@
     </td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
-    <td valign="top"><span id="prompt_user_lastname" class="text"><?php echo prompt_language("la_prompt_LastName"); ?></span></td>
-    <td> 
-     <input type="text" name="user_lastname" class="text" tabindex="6" size="30" value="<?php echo $c->parsetag("user_lastname"); ?>">
-    </td>
-    <td></td>
-  </tr>
+  
+	<tr <?php int_table_color(); ?>> 
+    	<td valign="top">
+    		<span id="prompt_user_lastname" class="text"><?php echo prompt_language("la_prompt_LastName"); ?></span>
+    	</td>
+    	<td> 
+     		<input type="text" name="user_lastname" class="text" tabindex="6" size="30" value="<?php echo $c->parsetag("user_lastname"); ?>">
+    	</td>
+    	<td></td>
+  	</tr>
+  	
+  	<tr <?php int_table_color(); ?>> 
+    	<td valign="top">
+    		<span id="prompt_user_company" class="text"><?php echo prompt_language("la_fld_Company"); ?></span>
+    	</td>
+    	<td> 
+     		<input type="text" name="user_company" class="text" tabindex="7" size="30" value="<?php echo inp_htmlize($c->Get('Company')); ?>">
+    	</td>
+    	<td></td>
+  	</tr>
 
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><span ID="prompt_user_email" class="text"><?php echo prompt_language("la_prompt_Email"); ?></span></td>
     <td> 
-     <input type="text" ValidationType="exists" name="user_email" tabindex="7" ID="user_email" class="text" size="30" value="<?php echo $c->parsetag("user_email"); ?>">
+     <input type="text" ValidationType="exists" name="user_email" tabindex="8" ID="user_email" class="text" size="30" value="<?php echo $c->parsetag("user_email"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><SPAN id="prompt_user_dob" class="text"><?php echo prompt_language("la_prompt_birthday"); ?></SPAN></td>
     <td> 
-      <input type="text" ValidationType="date,exists" tabindex="8" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">            
+      <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">            
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
 
-    <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_phone" class="text"><?php echo prompt_language("la_prompt_Phone"); ?></span></td>
     <td> 
-     <input type="text" name="user_phone" tabindex="9" class="text" size="30" value="<?php echo $c->parsetag("user_phone"); ?>">
+     <input type="text" name="user_phone" tabindex="10" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Phone')); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
+  
+	<tr <?php int_table_color(); ?>> 
+    	<td valign="top">
+    		<span id="prompt_user_fax" class="text"><?php echo prompt_language("la_fld_Fax"); ?></span>
+    	</td>
+    	<td> 
+     		<input type="text" name="user_fax" tabindex="11" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Fax')); ?>">
+    	</td>
+    	<td>
+    		<span class="text">&nbsp;</span>
+    	</td>
+	</tr>
 
+	<tr <?php int_table_color(); ?>> 
+		<td valign="top">
+			<span id="prompt_user_street" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 1</span>
+		</td>
+		<td> 
+     		<input type="text" name="user_street" tabindex="12" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street')); ?>">
+    	</td>
+    	<td>
+    		<span class="text">&nbsp;</span>
+    	</td>
+  	</tr>
+  	
+  	<tr <?php int_table_color(); ?>> 
+		<td valign="top">
+			<span id="prompt_user_street2" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 2</span>
+		</td>
+		<td> 
+     		<input type="text" name="user_street2" tabindex="13" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street2')); ?>">
+    	</td>
+    	<td>
+    		<span class="text">&nbsp;</span>
+    	</td>
+  	</tr>
+  
   <tr <?php int_table_color(); ?>> 
-    <td valign="top"><span id="prompt_user_street" class="text"><?php echo prompt_language("la_prompt_Street"); ?></span></td>
-    <td> 
-     <input type="text" name="user_street" tabindex="10" class="text" size="40" value="<?php echo $c->parsetag("user_street"); ?>">
-    </td>
-    <td><span class="text">&nbsp;</span></td>
-  </tr>
-  <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_city" class="text"><?php echo prompt_language("la_prompt_City"); ?></span></td>
     <td> 
-     <input type="text" name="user_city" class="text" tabindex="11" size="30" value="<?php echo $c->parsetag("user_city"); ?>">
+     <input type="text" name="user_city" class="text" tabindex="14" size="30" value="<?php echo $c->parsetag("user_city"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
     <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_state" class="text"><?php echo prompt_language("la_prompt_State"); ?></span></td>
     <td> 
-     <input type="text" name="user_state" class="text" tabindex="12" size="20" value="<?php echo $c->parsetag("user_state"); ?>">
+     <input type="text" name="user_state" class="text" tabindex="15" size="20" value="<?php echo $c->parsetag("user_state"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_zip" class="text"><?php echo prompt_language("la_prompt_Zip"); ?></span></td>
     <td> 
-     <input type="text" name="user_zip" class="text" size="15" tabindex="13" value="<?php echo $c->parsetag("user_zip"); ?>">
+     <input type="text" name="user_zip" class="text" size="6" tabindex="16" value="<?php echo $c->parsetag("user_zip"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
     <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_country" class="text"><?php echo prompt_language("la_prompt_Country"); ?></span></td>
     <td> 
-     <input type="text" name="user_country" class="text" tabindex="14" size="30" value="<?php echo $c->parsetag("user_country"); ?>">
+     <input type="text" name="user_country" class="text" tabindex="17" size="30" value="<?php echo $c->parsetag("user_country"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
   <?php int_subsection_title(prompt_language("la_prompt_Properties")); ?>
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_status" class="text"><?php echo prompt_language("la_prompt_Status"); ?></span></td>
     <td>
-      <input type="radio" name="status" class="text" tabindex="15" value="1" <?php if($c->Get("Status") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Active"); ?>
-      <input type="radio" name="status" class="text" tabindex="15" value="2" <?php if($c->Get("Status") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Pending"); ?>
-      <input type="radio" name="status" class="text" tabindex="15" value="0" <?php if($c->Get("Status") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Disabled"); ?>
+      <input type="radio" name="status" class="text" tabindex="18" value="1" <?php if($c->Get("Status") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Active"); ?>
+      <input type="radio" name="status" class="text" tabindex="18" value="2" <?php if($c->Get("Status") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Pending"); ?>
+      <input type="radio" name="status" class="text" tabindex="18" value="0" <?php if($c->Get("Status") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Disabled"); ?>
      </td>
     <td class="text">&nbsp;</td>
   </tr>
   <!-- User: CreatedOn: begin -->
  <tr <?php int_table_color(); ?>> 
     <td valign="top"><SPAN id="prompt_user_date" class="text"><?php echo prompt_language("la_prompt_CreatedOn"); ?></SPAN></td>
     <td> 
-      <input type="text" name="user_date" id="user_date_selector" tabindex="16" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">            
+      <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">            
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><SPAN id="prompt_user_time" class="text"><?php echo prompt_language("la_prompt_CreatedOn_Time"); ?></SPAN></td>
     <td> 
-      <input type="text" name="user_time" tabindex="5" class="text" size="20" value="<?php echo $c->parsetag("user_time"); ?>">
+      <input type="text" name="user_time" tabindex="20" class="text" size="20" value="<?php echo $c->parsetag("user_time"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_TimeFormat"); ?></span></td>
     <td></td>
   </tr>