diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl
index a13e544fe3..a5e75e634d 100644
--- a/phpgwapi/templates/default/login.tpl
+++ b/phpgwapi/templates/default/login.tpl
@@ -40,16 +40,16 @@
 <!-- END remember_me_selection -->
 				<tr>
 					<td align="right">{lang_username}:&nbsp;</td>
-					<td><input name="login" tablindex="1" value="{cookie}" size="30" /></td>
+					<td><input name="login" tabindex="4" value="{cookie}" size="30" /></td>
 				</tr>
 				<tr>
 					<td align="right">{lang_password}:&nbsp;</td>
-					<td><input name="passwd" type="password" size="30" /></td>
+					<td><input name="passwd" tabindex="5" type="password" size="30" /></td>
 				</tr>
 				<tr>
 					<td>&nbsp;</td>
 					<td>
-						<input type="submit" value="  {lang_login}  " name="submitit" />
+						<input tabindex="6" type="submit" value="  {lang_login}  " name="submitit" />
 					</td>
 				</tr>
 <!-- BEGIN registration -->
diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 9385bc09b6..2b8a168d0d 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -316,7 +316,7 @@ class idots_framework extends egw_framework
 			}
 			$tmpl->set_var(array(
 				'lang_domain'   => lang('domain'),
-				'select_domain' => html::select('logindomain',$_COOKIE['last_domain'],$domains,true),
+				'select_domain' => html::select('logindomain',$_COOKIE['last_domain'],$domains,true,'tabindex="2"'),
 			));
 		}
 		else
@@ -406,7 +406,7 @@ class idots_framework extends 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),
+				translation::get_installed_langs(),true,'tabindex="1"'),
 			));
 		}
 		else
@@ -431,7 +431,7 @@ class idots_framework extends egw_framework
 				'1week'=> lang('1 Week'),
 				'1month' => lang('1 Month'),
 				'forever' => lang('Forever'),
-			),true));
+			),true,'tabindex="3"'));
 		}
 		else
 		{