Index: branches/RC/themes/default/misc/right_login.tpl
===================================================================
diff -u -N -r8929 -r10439
--- branches/RC/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 8929)
+++ branches/RC/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 10439)
@@ -23,7 +23,7 @@
 	<tr>
 		<td class="bgr-login">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<FORM method="POST" NAME="login" ACTION="<inp:m_form_action _form="login"/>">
+				<FORM method="POST" NAME="login" ACTION="<inp2:m_FormAction />">
 				<tr>
 					<td valign="top">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -38,23 +38,23 @@
 								</td>
 							</tr>
 							<tr>
-								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
+								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="login" _Form="login" _Required="1" /><br /></td>
 							</tr>
 							<tr>
 								<td class="field-title"><inp:m_language _Phrase="lu_prompt_password" />:</td>
 							</tr>
 							<tr>
-								<td><inp:m_form_input type="password" class="input" _field="login_password" _Form="login" _Required="1" style="width:135px;" /><br /></td>
+								<td><inp:m_form_input type="password" class="input" _field="password" _Form="login" _Required="1" style="width:135px;" /><br /></td>
 							</tr>
-							
+
 							<tr>
 								<td class="tips" nowrap>
-									<INPUT type="submit" name="login" value="<inp:m_language _Phrase="lu_login" />" class="button"> <input type="checkbox" name="usercookie" VALUE="1"><inp:m_language _Phrase="lu_remember_login" />
+									<INPUT type="submit" name="events[u][OnLogin]"  value="<inp:m_language _Phrase="lu_login" />" class="button"> <input type="checkbox" name="cb_remember_login" VALUE="1"><inp:m_language _Phrase="lu_remember_login" />
                 </td>
 							</tr>
 							<tr>
 								<td class="field-title"><span class="error"><inp:m_list_form_errors _Form="login" _ItemTemplate="misc/form_error.tpl" /></span></td>
-							</tr>  
+							</tr>
 							<tr>
 								<td class="option-txt"><br /><br />
 									<a href="<inp:m_template_link _Template="register" />"><inp:m_language _Phrase="lu_register" /></a> <img src="img/arr_more.gif" width="16" height="7" alt="" /><br />