diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl
index ea8d89290c..b3074cd250 100755
--- a/phpgwapi/templates/idots/login.tpl
+++ b/phpgwapi/templates/idots/login.tpl
@@ -13,13 +13,13 @@
 <a href="http://{logo_url}"><img src="{logo_file}" alt="{logo_title}" title="{logo_title}" border="0"></a>
 <CENTER>{lang_message}</CENTER>
 <p>&nbsp;</p>
+<FORM name="login_form" method="post" action="{login_url}">
 <TABLE class=sidebox cellSpacing=1 cellPadding=0  border=0  align=center>
 <TR> 
 <TD class="sideboxtitle" align="center"  height=28>{website_title}</TD>
 </TR>
 <TR> 
 <TD class="sideboxcontent" bgColor="#efefef">
-<FORM method="post" action="{login_url}">
 
 <TABLE class="sideboxtext" cellSpacing=0 cellPadding=0 width="100%" border="0">
 <TR bgcolor="#e6e6e6">
@@ -44,9 +44,19 @@
 </TR>
 <TR bgcolor="#e6e6e6">
 <TD colspan="3" align="CENTER">
+&nbsp;
+</TD>
+</TR>
+<TR bgcolor="#e6e6e6">
+<TD colspan="3" align="CENTER">
 <input type="submit" value="{lang_login}" name="submitit">
 </TD>
 </TR>
+<TR bgcolor="#e6e6e6">
+<TD colspan="3" align="CENTER">
+&nbsp;
+</TD>
+</TR>
 <!--
 <TR bgcolor="#e6e6e6">
 <TD colspan="3" align="RIGHT">
@@ -55,11 +65,17 @@
 </TR>
 -->
 </TABLE>
-</FORM>
 
 </TD>
 </TR>
 </TABLE>
+</FORM>
+<script language="javascript1.2">
+<!--
+// position cursor in top form field
+document.login_form.login.focus();
+//-->
+</script>
 <div style="bottom:10px;left:10px;position:absolute;visibility:hidden;">
 <img src="phpgwapi/templates/{template_set}/images/valid-html401.png" border="0" alt="Valid HTML 4.01">
 <img src="phpgwapi/templates/{template_set}/images/vcss.png" border="0" alt="Valid CSS">