Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r7698 -r7701
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7701)
@@ -59,16 +59,16 @@
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+<table class="edit-form">
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>