Index: trunk/kernel/admin_templates/login.tpl
===================================================================
diff -u -r4490 -r4524
--- trunk/kernel/admin_templates/login.tpl	(.../login.tpl)	(revision 4490)
+++ trunk/kernel/admin_templates/login.tpl	(.../login.tpl)	(revision 4524)
@@ -7,8 +7,8 @@
 		<tr>
 		    <td valign="middle" align="center"> 
 		      <div align="center">
-		        <img title="In-portal" src="img/globe.gif" width="84" height="91" border="0">
-		        <img title="In-portal" src="img/logo.gif" width="150" height="91" border="0"><br />
+		        <img title="In-portal" src="img/globe.gif" width="84" height="82" border="0">
+		        <img title="In-portal" src="img/logo.gif" width="150" height="82" border="0"><br />
 		        
 		        
 		        <table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="222" height="30">
@@ -25,18 +25,17 @@
 		        			<table cellpadding="4" cellspacing="0" border="0">
 		        				<tr bgcolor="#F0F0F0"> 
 		              				<td class="text"><inp2:m_phrase name="la_Text_Login"/></td>
-		              				<td><input type="text" name="login" class="text"></td>
+		              				<td><input type="text" name="login" class="text" onkeypress="catchHotKeysA(event);"></td>
 		            			</tr>
 		            			<tr bgcolor="#F0F0F0"> 
 		              				<td class="text"><inp2:m_phrase name="la_prompt_Password"/></td>
-		              				<td><input type="password" name="password" class="text"></td>
+		              				<td><input type="password" name="password" class="text" onKeyPress="catchHotKeysA(event);"></td>
 		            			</tr>
 		            			<tr bgcolor="#F0F0F0"> 
 		              				<td colspan="2"> 
 		                				<div align="left">
-		                  					<input type="submit" name="submit" value="<inp2:m_phrase name="la_Login"/>" onclick="submit_event('u', 'OnLogin');" class="button">
-											<input type="reset" name="Cancel" value="<inp2:m_phrase name="la_Cancel"/>" class="button">
-											<input type="hidden" name="events[u][OnLogin]" value="" />
+		                  					<input type="submit" name="login_button" onclick="doLogin();" value="<inp2:m_phrase name="la_Login"/>" class="button">
+											<input type="reset" name="cancel_button" value="<inp2:m_phrase name="la_Cancel"/>" class="button">
 		                				</div>
 		              				</td>
 		            			</tr>
@@ -50,9 +49,20 @@
 	    	</td>
 		</tr>
 	</table>
-	<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+	<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>">
 	
 	<script type="text/javascript">
+		function doLogin()
+		{
+			submit_event('u', 'OnLogin');
+		}
+		
+		function catchHotKeysA(e)
+		{
+			if (!e) return;
+		 	if (e.keyCode == 13) doLogin();
+		}
+	
 		var a_parent = window.parent;
 		function redirect() 
 		{