Index: branches/RC/themes/default/misc/right_loggedin.tpl
===================================================================
diff -u -r9405 -r10439
--- branches/RC/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 9405)
+++ branches/RC/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 10439)
@@ -1,4 +1,4 @@
-<!-- template=right_loggedin.tpl -->						
+<!-- template=right_loggedin.tpl -->
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <!-- login box -->
   <tr>
@@ -49,8 +49,8 @@
 								</inp2:m_if>
 							</inp2:m_if>
 							<tr>
-							  <td align="center"><a href="<inp:m_logout_link _Tenplate="index" _Category=0 />"><img src="img/ic_logout.gif" width="22" height="23" alt="" /></a><br /></td>
-							  <td class="item-my"><a href="<inp:m_logout_link _Tenplate="index" _Category=0 />"><inp:m_language _Phrase="lu_logout" /></a></td>
+							  <td align="center"><a href="<inp2:u_LogoutLink template="index" />"><img src="img/ic_logout.gif" width="22" height="23" alt="" /></a><br /></td>
+							  <td class="item-my"><a href="<inp2:u_LogoutLink template="index" />"><inp:m_language _Phrase="lu_logout" /></a></td>
 							</tr>
 			        		<tr>
 								<td colspan="2"><img src="img/s.gif" width="1" height="10" alt="" /><br /></td>
@@ -64,7 +64,7 @@
 							<tr>
 							  <td align="center"><a href="<inp:m_template_link _Template="items_since_last" />"><img src="img/ic_mypreferences.gif" width="22" height="18" alt="" /></a><br /></td>
 							  <td class="item-my"><a href="<inp:m_template_link _Template="items_since_last" />"><inp:m_language _Phrase="lu_items_since_last" /></a></td>
-							</tr>							
+							</tr>
 			        <inp:mod_include _Template="menu_my_items" />
 						</table>
 					</td>
Index: branches/RC/themes/default/my_account.tpl
===================================================================
diff -u -r9405 -r10439
--- branches/RC/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 9405)
+++ branches/RC/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 10439)
@@ -63,7 +63,7 @@
 							<tr>
 								<td><img src="img/s.gif" width="20" height="1" alt="" /><br /></td>
 								<td valign="top" width="10000" class="bgr-myaccount">
-									
+
 									<!-- page title //-->
 									<img src="img/s.gif" width="1" height="5" alt="" /><br />
 									<table width="98%" border="0" cellspacing="0" cellpadding="0">
@@ -180,10 +180,10 @@
 										<tr>
 											<td><img src="img/s.gif" width="70" height="1" alt="" /><br /></td>
 											<td valign="top">
-												<a href="<inp:m_form_action _Form="logout" _Template="index" />"><img src="img/ic_logout46.gif" width="46" height="46" alt="" /></a><br />
+												<a href="<inp2:u_LogoutLink template="index" />"><img src="img/ic_logout46.gif" width="46" height="46" alt="" /></a><br />
 											</td>
 											<td width="10000" class="item">
-												<a href="<inp:m_form_action _Form="logout" _Template="index" />"><inp:m_language _Phrase="lu_logout" /></a>
+												<a href="<inp2:u_LogoutLink template="index" />"><inp:m_language _Phrase="lu_logout" /></a>
 												<p><inp:m_language _Phrase="lu_logout_description" /></p>
 											</td>
 											<td>&nbsp;</td>
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r10434 -r10439
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 10434)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 10439)
@@ -444,7 +444,7 @@
 			}
 
 			$this->Application->resetCounters('UserSession');
-			$this->Application->Session->SetCookie('login', '', adodb_mktime() - 3600);
+			$this->Application->Session->SetCookie('remember_login', '', adodb_mktime() - 3600);
 
 			$event->SetRedirectParam('pass', 'all');
 		}
Index: branches/RC/themes/default/login/login_form.tpl
===================================================================
diff -u -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>
Index: branches/RC/themes/default/misc/right_login.tpl
===================================================================
diff -u -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 />