Index: advanced/in-commerce/elements/forms.elm.tpl
===================================================================
--- advanced/in-commerce/elements/forms.elm.tpl	(revision 14590)
+++ advanced/in-commerce/elements/forms.elm.tpl	(working copy)
@@ -1,44 +1,14 @@
-<inp2:m_DefineElement name="inp_affiliate_caption" style="" valign="top" title="" required="0">
-	<td class="field-name" valign="<inp2:m_Param name="valign"/>" style="<inp2:m_Param name="style"/>">
-		<inp2:m_phrase label="$title"/><inp2:m_if check="m_ParamEquals" name="required" value="1"><span class="field-required"> *</span></inp2:m_if>:
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_box" is_last="0" style="" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value" nowrap>
-			<inp2:m_if check="m_GetEquals" var="{$field}RequiredError" value="1">
-				<span class="field-error"><inp2:m_Phrase label="la_err_required" /></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:m_Param name="field"/>" value="<inp2:m_Get var="$field" />" tabindex="<inp2:m_get param="tab_index"/>"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_textarea" is_last="0" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value">
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:m_param name="field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>"><inp2:m_Get var="$field" /></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="affiliate_payment_type_element">
 	<tr>
 		<td valign="top" nowrap>
-			<input type="radio" name="<inp2:m_Param name="field"/>" id="<inp2:m_Param name="field"/>_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="$field" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if>/>
+			<input type="radio" name="<inp2:$prefix_InputName name='$field'/>" id="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>" value="<inp2:Field name='PaymentTypeId'/>"<inp2:m_if check="Checked" prefix="$prefix" field="$field"> checked</inp2:m_if>/>
 		</td>
 		<td>
-			<label for="<inp2:m_Param name="field"/>_<inp2:Field name="$field" />">
-				<inp2:Field name="Name" /><br />
+			<label for="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>">
+				<inp2:Field name="Name" />
+
 				<inp2:m_if check="Field" name="Description">
-					<inp2:Field name="Description" />
+					<br /><inp2:Field name="Description" />
 				</inp2:m_if>
 			</label>
 		</td>
@@ -47,30 +17,34 @@
 
 <inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+
 			<table>
-				<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_element" field="$field"/>
+				<inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
 			</table>
 		</td>
 	</tr>
+	
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" is_last="0">
+<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" title="" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<td class="field-name" nowrap>
-			&nbsp;
-		</td>
-		<td class="field-value">
-			<inp2:m_if check="m_GetEquals" var="MustAgreeToTerms" value="1">
-				<span class="field-error"><inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError" /></span><br />
+		<td class="field-name" nowrap>&nbsp;</td>
+		<td>
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
-			<input type="checkbox" name="AgreeToAffiliateTerms"/>
-			<inp2:m_Phrase label="lu_comm_IAgreeTo" />
+
+			<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> value="1"/>
+
+			<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_IAgreeTo" /></label>
 			<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
-			<inp2:m_Phrase label="lu_comm_TermsAndConditions" />
+			<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_TermsAndConditions" /></label>
 		</td>
 	</tr>
 
Index: advanced/in-commerce/elements/registration_fields.elm.tpl
===================================================================
--- advanced/in-commerce/elements/registration_fields.elm.tpl	(revision 14590)
+++ advanced/in-commerce/elements/registration_fields.elm.tpl	(working copy)
@@ -1,9 +1,8 @@
 	<!--## AFFILIATE REGISTRATION CHECKBOX ##-->
-	<inp2:m_if check="m_ConfigEquals" option="Comm_RegisterAsAffiliate" value="1">
-
+	<inp2:m_if check="m_AllowAffiliateRegistration">
 		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="field-name">
 				<label for="RegisterAsAffiliate">
@@ -11,8 +10,8 @@
 				</label>
 			</td>
 			<td class="field-value">
-				<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
-				<input class="hidden-element" type="submit" id="events[u][OnRefreshForm]" name="events[u][OnRefreshForm]" />
+				<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
+				<input class="hidden-element" type="submit" id="events[u.register][OnRefreshForm]" name="events[u.register][OnRefreshForm]" />
 			</td>
 		</tr>
 
@@ -26,15 +25,17 @@
 	<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
 		<inp2:m_include template="in-commerce/elements/forms.elm"/>
 
-		<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" required="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
-		<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
+		<inp2:affil.register_FormName name="registration"/>
+		<inp2:affil.register_PresetFormFields/>
 
-		<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField"/>
+		<inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
+		<inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
 	</inp2:m_if>
 
 <script type="text/javascript">
 	function toggle_affiliate() {
-		document.getElementById('events[u][OnRefreshForm]').click();
+		document.getElementById('events[u.register][OnRefreshForm]').click();
 	}
 </script>
\ No newline at end of file
Index: advanced/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
--- advanced/in-commerce/my_account/affiliate/affiliate.tpl	(revision 14590)
+++ advanced/in-commerce/my_account/affiliate/affiliate.tpl	(working copy)
@@ -56,12 +56,12 @@
 				</inp2:m_DefineElement>
 
 				<inp2:m_if check="u_IsAffiliate">
-				<!-- Affiliate Section List -->
+					<!-- Affiliate Section List -->
 					<inp2:m_Capture to_var="header">
 						<inp2:m_Phrase label="lu_title_Affiliate"/>
 					</inp2:m_Capture>
 
-					<inp2:m_if check="u_AffiliateIsNotActive">
+					<inp2:m_ifnot check="u_AffiliateIsActive">
 						<table class="warning-message fullwidth">
 							<tr>
 								<td width="30">
@@ -72,7 +72,7 @@
 						</table>
 						<br />
 						<inp2:m_Phrase label="lu_AffiliateIsPendingOrDisabled"/><br /><br />
-					</inp2:m_if>
+					</inp2:m_ifnot>
 
 					<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_statistics" label="lu_comm_AffiliateStatistics" text="lu_AffiliateStatisticsText"/>
 					<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payments" label="lu_AffiliatePayments" text="lu_AffiliatePaymentsText"/>
@@ -91,23 +91,28 @@
 
 					<inp2:m_Phrase label="lu_BecomeAnAffiliateDescription"/><br /><br />
 
-					<inp2:m_if check="u_HasError" field="any">
+
+					<inp2:affil.register_FormName name="registration"/>
+					<inp2:affil.register_PresetFormFields/>
+
+					<inp2:m_if check="affil.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 />
 					<inp2:m_include template="in-commerce/elements/forms.elm"/>
+
 					<form method="post" action="<inp2:m_FormAction/>">
 						<table border="0" class="form-data fullwidth">
-							<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" style="width:155px" required="1"/>
-							<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
-							<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
-							<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
+							<inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField" style="width:155px"/>
+							<inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
+							<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
+							<inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
 								<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_thankyou" />
-								<input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate" no_editing="1"/>" />
+								<input type="submit" class="button" name="events[affil.register][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate" no_editing="1"/>" />
 							</inp2:m_RenderElement>
 						</table>
 					</form>
Index: advanced/in-commerce/my_account/affiliate/affiliate_materials.tpl
===================================================================
--- advanced/in-commerce/my_account/affiliate/affiliate_materials.tpl	(revision 14590)
+++ advanced/in-commerce/my_account/affiliate/affiliate_materials.tpl	(working copy)
@@ -42,7 +42,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_AffiliateMaterials" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_materials"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_AffiliateMaterials" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_materials"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box">
Index: advanced/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
===================================================================
--- advanced/in-commerce/my_account/affiliate/affiliate_payment_type.tpl	(revision 14590)
+++ advanced/in-commerce/my_account/affiliate/affiliate_payment_type.tpl	(working copy)
@@ -44,7 +44,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payment_type"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliatePaymentType" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payment_type"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box">
@@ -68,12 +68,12 @@
 				<inp2:m_include template="in-commerce/elements/forms.elm"/>
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table border="0" class="form-data fullwidth">
-						<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
-						<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
+						<inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.user" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
+						<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.user" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons">
 							<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_payment_type_changed" />
-							<input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_ChangePaymentType" no_editing="1"/>" />
+							<input type="submit" class="button" name="events[affil.user][OnChangePaymentType]" value="<inp2:m_Phrase label='lu_ChangePaymentType' no_editing='1'/>" />
 						</inp2:m_RenderElement>
 					</table>
 				</form>
Index: advanced/in-commerce/my_account/affiliate/affiliate_payments.tpl
===================================================================
--- advanced/in-commerce/my_account/affiliate/affiliate_payments.tpl	(revision 14590)
+++ advanced/in-commerce/my_account/affiliate/affiliate_payments.tpl	(working copy)
@@ -42,7 +42,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_ComissionPayments" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payments"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_ComissionPayments" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payments"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box" block_no_data="no_payments">
Index: advanced/platform/elements/side_boxes/login.elm.tpl
===================================================================
--- advanced/platform/elements/side_boxes/login.elm.tpl	(revision 14590)
+++ advanced/platform/elements/side_boxes/login.elm.tpl	(working copy)
@@ -82,7 +82,9 @@
 <!-- IF NOT LOGGED IN! -->
 
 	<form method="post" action="<inp2:m_FormAction />">
-		<inp2:m_if check="u_UseUsernames">
+		<inp2:u.login-sidebox_FormName name="login"/>
+
+		<inp2:m_if check="u.login-sidebox_UseUsernames">
 			<inp2:m_phrase label="lu_username"/><br />
 		<inp2:m_else/>
 			<inp2:m_phrase label="lu_email"/><br />
Index: advanced/platform/elements/side_boxes/mailing_list.elm.tpl
===================================================================
--- advanced/platform/elements/side_boxes/mailing_list.elm.tpl	(revision 14590)
+++ advanced/platform/elements/side_boxes/mailing_list.elm.tpl	(working copy)
@@ -6,14 +6,17 @@
 <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
 
 <form method="POST" action="<inp2:m_FormAction />" name="mailing_list_form">
-	<input type="text" name="subscriber_email" class="input-text" style="width: 155px;"/><br />
-	<inp2:m_if check="u_HasError" field="any">
-		<span class="field-error"><inp2:u_Error field="SubscribeEmail"/></span><br />
+	<inp2:u.subscribe-sidebox_FormName name="subscription"/>
+
+	<input type="text" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" class="input-text" style="width: 155px;"/><br />
+
+	<inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
+		<span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
 	</inp2:m_if>
 
 	<br />
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" />
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Unsubscribe' no_editing='1'/>" />
+	<input class="button" name="events[u.subscribe-sidebox][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" />
+	<input class="button" name="events[u.subscribe-sidebox][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Unsubscribe' no_editing='1'/>" />
 	&nbsp;
 	<input type="text" style="display: none" />
 	<input type="hidden" name="subscribe_template" value="platform/mailing_list/subscribe"/>
Index: advanced/platform/elements/side_boxes/recommend_site.elm.tpl
===================================================================
--- advanced/platform/elements/side_boxes/recommend_site.elm.tpl	(revision 14590)
+++ advanced/platform/elements/side_boxes/recommend_site.elm.tpl	(working copy)
@@ -6,6 +6,8 @@
 <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
 
 <form method="POST" action="<inp2:m_FormAction />">
+	<inp2:u.recommend-sidebox_FormName name="recommend"/>
+
 	<input type="text" class="input-text" name="<inp2:u.recommend-sidebox_InputName name='RecommendEmail'/>" value="<inp2:u.recommend-sidebox_Field name='RecommendEmail'/>" style="width: 155px;" /><br />
 	<inp2:m_if check="u.recommend-sidebox_HasError" field="any">
 		<span class="field-error"><inp2:u.recommend-sidebox_Error field="RecommendEmail"/></span><br />
Index: advanced/platform/login/forgot_password.tpl
===================================================================
--- advanced/platform/login/forgot_password.tpl	(revision 14590)
+++ advanced/platform/login/forgot_password.tpl	(working copy)
@@ -49,6 +49,8 @@
 				</inp2:m_if>
 				<br /><br />
 
+				<inp2:u.forgot_FormName name="forgot_password"/>
+
 				<inp2:m_if check="u.forgot_HasError" field="any">
 					<inp2:m_RenderElement name="error_message"/>
 				</inp2:m_if>
Index: advanced/platform/login/register.tpl
===================================================================
--- advanced/platform/login/register.tpl	(revision 14590)
+++ advanced/platform/login/register.tpl	(working copy)
@@ -46,8 +46,9 @@
 
 				<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>
 
@@ -55,48 +56,50 @@
 
 				<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>
Index: advanced/platform/mailing_list/subscribe.tpl
===================================================================
--- advanced/platform/mailing_list/subscribe.tpl	(revision 14590)
+++ advanced/platform/mailing_list/subscribe.tpl	(working copy)
@@ -41,7 +41,7 @@
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+					<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
 					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
Index: advanced/platform/mailing_list/unsubscribe.tpl
===================================================================
--- advanced/platform/mailing_list/unsubscribe.tpl	(revision 14590)
+++ advanced/platform/mailing_list/unsubscribe.tpl	(working copy)
@@ -41,7 +41,7 @@
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+					<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
 					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>