diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 515df50156d..3e3a279e575 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -1386,8 +1386,8 @@ function dol_loginfunction($notused,$pearstatus)
 	print '</style>'."\n";
 	print '<script language="javascript" type="text/javascript">'."\n";
 	print "function donnefocus() {\n";
-	if (! $_REQUEST["username"]) print "document.getElementsByTagName('INPUT')[0].focus();";
-	else print "document.getElementsByTagName('INPUT')[1].focus();";
+	if (! $_REQUEST["username"]) print "document.getElementById('username').focus();\n";
+	else print "document.getElementById('password').focus();\n";
 	print "}\n";
 	print '</script>'."\n";
 	print '</head>'."\n";
@@ -1423,7 +1423,7 @@ function dol_loginfunction($notused,$pearstatus)
 
 	print '<tr>';
 	print '<td align="left" valign="top"><br> &nbsp; <b>'.$langs->trans("Login").'</b>  &nbsp;</td>';
-	print '<td><input type="text" name="username" class="flat" size="15" maxlength="25" value="'.(isset($_REQUEST["username"])?$_REQUEST["username"]:'').'" tabindex="1" /></td>';
+	print '<td><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="'.(isset($_REQUEST["username"])?$_REQUEST["username"]:'').'" tabindex="1" /></td>';
 
 	if ($conf->main_authentication) $title.=$langs->trans("AuthenticationMode").': '.$conf->main_authentication;
 
@@ -1449,7 +1449,7 @@ function dol_loginfunction($notused,$pearstatus)
 	print '</tr>'."\n";
 
 	print '<tr><td align="left" valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Password").'</b> &nbsp; </td>';
-	print '<td valign="top" nowrap="nowrap"><input name="password" class="flat" type="password" size="15" maxlength="30" tabindex="2">';
+	print '<td valign="top" nowrap="nowrap"><input id="password" name="password" class="flat" type="password" size="15" maxlength="30" tabindex="2">';
 	print '</td></tr>';
 	
 	print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
@@ -1463,7 +1463,7 @@ function dol_loginfunction($notused,$pearstatus)
 		print '<td valign="top" nowrap="nowrap" align="left" class="e">';
 		
 		print '<table><tr><td>';
-		print '<input class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2">';
+		print '<input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="3">';
 		print '</td><td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="128" height="36">';
 		print '</td></tr></table>';
 		
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 30cbc7d98ff..8a8200dc38c 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -176,8 +176,8 @@ print '-->'."\n";
 print '</style>'."\n";
 print '<script language="javascript" type="text/javascript">'."\n";
 print "function donnefocus() {\n";
-if (! $_REQUEST["username"]) print "document.getElementsByTagName('INPUT')[0].focus();";
-else print "document.getElementsByTagName('INPUT')[1].focus();";
+if (! $_REQUEST["username"]) print "document.getElementById('username').focus();\n";
+else print "document.getElementById('password').focus();\n";
 print "}\n";
 print '</script>'."\n";
 print '</head>'."\n";
@@ -215,7 +215,7 @@ print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
 
 print '<tr>';
 print '<td align="left" valign="top"><br> &nbsp; <b>'.$langs->trans("Login").'</b>  &nbsp;</td>';
-print '<td><input type="text" '.$disabled.' name="username" class="flat" size="15" maxlength="25" value="'.(isset($_POST["username"])?$_POST["username"]:'').'" tabindex="1" /></td>';
+print '<td><input id="username" type="text" '.$disabled.' name="username" class="flat" size="15" maxlength="25" value="'.(isset($_POST["username"])?$_POST["username"]:'').'" tabindex="1" /></td>';
 
 $title='';
 
@@ -248,7 +248,7 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
 	print '<td valign="top" nowrap="nowrap" align="left" class="e">';
 	
 	print '<table><tr>';
-	print '<td><input class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2"></td>';
+	print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2"></td>';
 	print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="128" height="36"></td>';
 	print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>';
 	print '</tr></table>';
@@ -260,7 +260,7 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
 print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
 
 print '<tr><td colspan="3" style="text-align:center;"><br>';
-print '<input type="submit" '.$disabled.' class="button" value="'.$langs->trans("SendNewPassword").'" tabindex="4">';
+print '<input id="password" type="submit" '.$disabled.' class="button" name="password" value="'.$langs->trans("SendNewPassword").'" tabindex="4">';
 print '</td></tr>'."\n";
 
 print "</table>"."\n";