diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index cdc49b1714..d24f734645 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -373,7 +373,7 @@ abstract class egw_framework
 			}
 			$tmpl->set_var(array(
 				'lang_domain'   => lang('domain'),
-				'select_domain' => html::select('logindomain',$_COOKIE['last_domain'],$domains,true,'tabindex="2"'),
+				'select_domain' => html::select('logindomain',$_COOKIE['last_domain'],$domains,true,'tabindex="2"',0,false),
 			));
 		}
 		else
@@ -464,7 +464,7 @@ abstract class egw_framework
 			$tmpl->set_var(array(
 				'lang_language' => lang('Language'),
 				'select_language' => html::select('lang',$GLOBALS['egw_info']['user']['preferences']['common']['lang'],
-				translation::get_installed_langs(),true,'tabindex="1"'),
+				translation::get_installed_langs(),true,'tabindex="1"',0,false),
 			));
 		}
 		else
@@ -489,7 +489,7 @@ abstract class egw_framework
 				'1week'=> lang('1 Week'),
 				'1month' => lang('1 Month'),
 				'forever' => lang('Forever'),
-			),true,'tabindex="3"'));
+			),true,'tabindex="3"',0,false));
 		}
 		else
 		{
@@ -499,8 +499,6 @@ abstract class egw_framework
 		}
 		$tmpl->set_var('autocomplete', ($GLOBALS['egw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
-		$GLOBALS['egw']->js->set_onload('document.login_form.login.focus();');
-
 		// load jquery for login screen too
 		self::validate_file('jquery', 'jquery');
 
diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl
index a5e75e634d..ea008b86d0 100644
--- a/phpgwapi/templates/default/login.tpl
+++ b/phpgwapi/templates/default/login.tpl
@@ -40,7 +40,7 @@
 <!-- END remember_me_selection -->
 				<tr>
 					<td align="right">{lang_username}:&nbsp;</td>
-					<td><input name="login" tabindex="4" value="{cookie}" size="30" /></td>
+					<td><input name="login" tabindex="4" value="{cookie}" size="30" autofocus /></td>
 				</tr>
 				<tr>
 					<td align="right">{lang_password}:&nbsp;</td>