Index: branches/1.2.x/platform/login/register.tpl
===================================================================
diff -u -N -r14435 -r14593
--- branches/1.2.x/platform/login/register.tpl	(.../register.tpl)	(revision 14435)
+++ branches/1.2.x/platform/login/register.tpl	(.../register.tpl)	(revision 14593)
@@ -46,57 +46,60 @@
 
 				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
-				<inp2:u_PresetFormFields/>
-				<inp2:m_if check="u_HasError" field="any">
+				<inp2:u.register_FormName name="registration"/>
+
+				<inp2:m_if check="u.register_HasError" field="any">
 					<inp2:m_RenderElement name="error_message" />
 				</inp2:m_if>
 
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_if check="u_UseUsernames">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+						<inp2:m_if check="u.register_UseUsernames">
+							<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Login" title="lu_fld_Login" style="width:155px" />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 						</inp2:m_if>
 
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName" title="lu_fld_LastName" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company" title="lu_fld_Company" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone" title="lu_fld_Phone" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Fax" title="lu_fld_Fax" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_date" prefix="u.register" field="dob" title="lu_fld_BirthDate" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City" title="lu_fld_City" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
 
 						<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
-							<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="PrimaryGroupId" title="lu_fld_UserGroup" />
+							<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="PrimaryGroupId" title="lu_fld_UserGroup" />
 						</inp2:m_if>
 
-						<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
+						<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
 
 						<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
 							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-							<inp2:m_RenderElement name="inp_edit_captcha" prefix="u" style="width: 170px;" />
+							<inp2:m_RenderElement name="inp_edit_captcha" prefix="u.register" style="width: 170px;" />
 						</inp2:m_if>
 
 						<inp2:m_ModuleInclude template="elements/registration_fields.elm"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons" no_editing="1">
-							<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
+							<input type="hidden" name="next_template" value="<inp2:m_get var='next_template'/>" />
 							<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
 							<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
 
-							<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
-							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
+							<input class="button" type="submit" name="events[u.register][OnCreate]" value="<inp2:m_Phrase label='lu_btn_Register' no_editing='1'/>"/>
+							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label='lu_btn_Cancel' no_editing="1"/>"/>
+
+							<input type="hidden" name="forms[u.register]" value="<inp2:u.register_FormName/>"/>
 						</inp2:m_RenderElement>
 					</table>
 				</form>