Index: branches/5.2.x/core/admin_templates/login.tpl
===================================================================
diff -u -N -r14244 -r14502
--- branches/5.2.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 14502)
@@ -127,18 +127,18 @@
 				    	<table class="login-table">
 			      			<tr>
 			      				<td colspan="2" style="text-align: center">
-			      				<inp2:m_if check="u.current_HasError" field="any">
-									<span class="error-cell"><inp2:u.current_Error field="ValidateLogin"/></span>
+			      				<inp2:m_if check="u.login-admin_HasError" field="any">
+									<span class="error-cell"><inp2:u.login-admin_Error field="UserLogin"/></span>
 								</inp2:m_if><br/>
 			      				</td>
 			      			</tr>
 			      			<tr>
 		          				<td class="text"><inp2:m_phrase name="la_Text_Login"/>:</td>
-		          				<td><input type="text" name="login" class="text" value="<inp2:u_CookieUsername submit_field="login"/>" style="width: 150px;"></td>
+		          				<td><input type="text" name="<inp2:u.login-admin_InputName name='UserLogin'/>" class="text" value="<inp2:u.login-admin_CookieUsername field='UserLogin'/>" style="width: 150px;"></td>
 		          			</tr>
 		          			<tr>
 		          				<td class="text"><inp2:m_phrase name="la_prompt_Password"/>:</td>
-		          				<td><input type="password" name="password" class="text" style="width: 150px;"></td>
+		          				<td><input type="password" name="<inp2:u.login-admin_InputName name='UserPassword'/>" class="text" style="width: 150px;"></td>
 		          			</tr>
 		          			<tr>
 			          			<td colspan="2">
@@ -165,15 +165,15 @@
 	<div id="footer-div"></div>
 
 	<inp2:m_if check="m_Param" name="http_auth">
-		<input type="hidden" name="events[u]" value="OnLogin"/>
-		<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>"/>
+		<input type="hidden" name="next_template" value="<inp2:m_if check='m_GetEquals' name='next_template' value="">index<inp2:m_else/><inp2:m_get var='next_template'/></inp2:m_if>"/>
 		<input type="hidden" name="skip_last_template" value="1"/>
 
 		<script type="text/javascript">
 
 			$(document).ready(
 				function() {
 					$("input[name='login']").focus();
+					Application.SetVar('events[u.login-admin]', 'OnLogin');
 				}
 			);