Index: branches/RC/themes/default/login/login_form.tpl
===================================================================
diff -u -N -r8929 -r10439
--- branches/RC/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 8929)
+++ branches/RC/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 10439)
@@ -1,5 +1,5 @@
 <table width="98%" border="0" cellspacing="0" cellpadding="0">
-	<FORM method="POST" NAME="login" ACTION="<inp:m_form_action _form="login" _Template="index" />">
+	<FORM method="POST" NAME="login" ACTION="<inp2:m_FormAction />">
 	<input type="hidden" name="shop_cart_template" value="in-commerce/shop_cart/shop_cart" />
 	<tr>
 		<!--<td valign="top"><img src="img/pic_login.jpg" width="45" height="236" alt="" /><br /></td>-->
@@ -14,31 +14,31 @@
 	  		<tr>
 	  			<td class="field-name">
 	  				<inp2:m_if check="u_UseUsernames">
-						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" />
 					<inp2:m_else/>
-						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" />
 					</inp2:m_if>
 	  				<span class="error">*</span>
 	  			</td>
-	  			<td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
+	  			<td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login" _Form="login" _Required="1" /><br /></td>
 	  			<td>&nbsp;</td>
 	  		</tr>
 	  		<tr>
-	  			<td class="field-name"><inp:m_form_prompt _form="login" _Field="login_password" _langtext="lu_prompt_password" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
-	  			<td class="field-content-input"><inp:m_form_input type="password" class="input" _field="login_password" _Form="login" _Required="1" style="width:135px;" /><br /></td>
+	  			<td class="field-name"><inp:m_form_prompt _form="login" _Field="login" _langtext="lu_prompt_password" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
+	  			<td class="field-content-input"><inp:m_form_input type="password" class="input" _field="password" _Form="login" _Required="1" style="width:135px;" /><br /></td>
 	  			<td>&nbsp;</td>
 	  		</tr>
 	  		<tr>
 	  			<td class="field-name">&nbsp;</TD>
-	  			<TD CLASS="field-content-input"><INPUT TYPE="CHECKBOX" name="usercookie" VALUE="1"><inp:m_language _Phrase="lu_remember_login" /></TD>
+	  			<TD CLASS="field-content-input"><INPUT TYPE="CHECKBOX" name="cb_remember_login" VALUE="1"><inp:m_language _Phrase="lu_remember_login" /></TD>
 	  			<td>&nbsp;</td>
 				<tr>
 	    	<tr>
 	    		<td class="field-name">&nbsp;</td>
 	    		<td class="field-content" valign="top">
 	    		    <span class="tips"><a href="<inp:m_template_link _Template="forgotpw" />"><inp:m_language _Phrase="lu_forgot_password_link" /></a></span><br />
 	    		    <img src="img/s.gif" width="1" height="15" alt="" /><br />
-	    		    <INPUT type="submit" name="login" value="<inp:m_language _Phrase="lu_login" />" class="button">&nbsp;&nbsp;<INPUT type="button" name="cancel" value="<inp:m_language _Phrase="lu_cancel" />" class="button" onClick="javascript:history.back(1);">
+	    		    <INPUT type="submit" name="events[u][OnLogin]"  value="<inp:m_language _Phrase="lu_login" />" class="button">&nbsp;&nbsp;<INPUT type="button" name="cancel" value="<inp:m_language _Phrase="lu_cancel" />" class="button" onClick="javascript:history.back(1);">
 	    		</td>
 	    		<td>&nbsp;</td>
 	    	</tr>