Index: branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl
===================================================================
diff -u -N -r14274 -r14593
--- branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl	(.../registration_fields.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl	(.../registration_fields.elm.tpl)	(revision 14593)
@@ -1,18 +1,17 @@
 	<!--## 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">
 					<inp2:m_phrase label="lu_fld_RegisterAsAffiliate"/>:
 				</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