Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -N -r14805 -r14806
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14805)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14806)
@@ -69,11 +69,11 @@
 
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_fld_CreditCardNumber"/>
 
-					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_fld_ExpirationDate" row_class="alt1 expdate">
-						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_fld_ExpirationDate" row_class="alt1 expdate" field_type="cc_expiration">
+						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>" id="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
 							<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
 						</select> /
-						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpYear'/>">
+						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpYear'/>" id="<inp2:ord_InputName field='PaymentCCExpYear'/>">
 							<option value=''></option>
 							<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
 						</select>
@@ -162,6 +162,8 @@
 			</div>
 			<div class="clear"></div>
 
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="PaymentType" db="db"/>
+
 			<input type="hidden" name="check_billing_address" id="check_billing_address" value="true"/>
 			<input type="hidden" name="check_shipping_address" id="check_shipping_address" value="true"/>
 			<input type="hidden" name="check_credit_card" id="check_credit_card" value="true"/>
@@ -226,9 +228,15 @@
 				$('body').bind(
 					'OnAfterLogin',
 					function ($e, $params) {
+						// 1. remove login button
 						$('.login-alt').remove();
+
+						// 2. remove user password controls
 						$('#create-account-password, .badge-optional').remove();
+						FormManager.unregisterField('ord', 'UserPassword');
+						FormManager.unregisterField('ord', 'VerifyUserPassword');
 
+						// 3. put user e-mail into the form
 						FormManager.setFieldStatus('ord', 'BillingEmail');
 						FormManager.getField('ord', 'BillingEmail').value = $params['user_email'];
 					}
@@ -242,5 +250,6 @@
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
+<inp2:m_Set check_credit_card="true"/>
 <inp2:m_include template="designs/default_design.des" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file