diff --git a/ChangeLog b/ChangeLog
index 7c1b893fc12..e410206d7f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,9 +13,10 @@ For users:
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
 - An external module can force its theme.
+- Add function dol_set_focus('#xxx').
 
 For translators:
-
+- Update language files.
 
 
 ***** ChangeLog for 3.3 compared to 3.2.3 *****
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fa0a1c22619..352e5d1384e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4224,6 +4224,18 @@ function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
 }
 
+/**
+ * Set focus onto field with selector
+ *
+ * @param 	string	$selector	Selector ('#id')
+ * @return	string				HTML code to set focus
+ */
+function dol_set_focus($selector)
+{
+	print '<!-- Set focus onto a specific field -->'."\n";
+	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
+}
+
 
 if (! function_exists('getmypid'))
 {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 090064ab0ec..cc5d50c5139 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -976,7 +976,7 @@ NotificationsDesc=EMails notifications feature allows you to silently send autom
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
-CompanyIdProfChecker=Professional Id unique
+CompanyIdProfChecker=Rules ono Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Must be mandatory ?
 Miscellanous=Miscellaneous
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index a43179386de..21b25865c15 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -973,7 +973,7 @@ NotificationsDesc= La fonction des notifications par emails permet d'envoyer aut
 ModelModules=Modèle de documents
 DocumentModelOdt=Genération depuis des modèles OpenDocument (Fichier .ODT OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Filigrane sur les documents brouillons
-CompanyIdProfChecker=Id professionnel unique 
+CompanyIdProfChecker=Règles sur les Ids professionnels 
 MustBeUnique=Doit être unique ?
 MustBeMandatory=Doit être obligatoire?
 Miscellanous=Divers
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index ed8d339af75..ec4084bf7e3 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -91,7 +91,7 @@ LastDayOfHoliday=Dernier jour de congès
 ConfCP=Configuration du module Congés
 DescOptionCP=Description de l'option
 ValueOptionCP=Valeur
-GroupToValidateCP=Groupe ayant la possibilité de valider les congés
+GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
 ConfirmConfigCP=Valider la configuration
 LastUpdateCP=Dernière mise à jour automatique des congés
 UpdateConfCPOK=Mise à jour effectuée avec succès.
@@ -127,4 +127,4 @@ NoCPforMonth=Aucun congé ce mois-ci.
 Jours=jours
 nbJours=Nombre jours
 TitleAdminCP=Configuration des Congés
-Permission20001=Lire / Créer / modifier ses congès
\ No newline at end of file
+Permission20001=Lire / Créer / modifier ses congès
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 4da27c64a55..4c1f40049a0 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -682,6 +682,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
        	print '<br>';
     }
 
+    print dol_set_focus('#nom');
+    
     print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
@@ -697,12 +699,12 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<td>';
     if (! empty($ldap_nom))
     {
-        print '<input type="hidden" name="nom" value="'.$ldap_nom.'">';
+        print '<input type="hidden" id="nom" name="nom" value="'.$ldap_nom.'">';
         print $ldap_nom;
     }
     else
     {
-        print '<input size="30" type="text" name="nom" value="'.GETPOST('nom').'">';
+        print '<input size="30" type="text" id="nom" name="nom" value="'.GETPOST('nom').'">';
     }
     print '</td></tr>';
 
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index e3efdb38745..201922e7a87 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -215,6 +215,8 @@ if ($action == 'create')
 
     if ($message) { print $message."<br>"; }
 
+    print dol_set_focus('#nom');
+
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
@@ -222,7 +224,7 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
 	print "<tr>".'<td valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
-	print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
+	print '<td class="valeur"><input size="30" type="text" id="nom" name="nom" value=""></td></tr>';
 
 	// Multicompany
 	if (! empty($conf->multicompany->enabled))