Index: branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
diff -u -N -r14274 -r14593
--- branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl	(.../affiliate.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl	(.../affiliate.tpl)	(revision 14593)
@@ -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>