diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 9cbd9ed876e..38cb796b4fb 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -86,10 +86,6 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 	{
 		print $db->error();
 	}
-	if (! dolibarr_set_const($db, 'LDAP_ADMIN_DN',$_POST["admin"]))
-	{
-		print $db->error();
-	}
 	if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"]))
 	{
 		print $db->error();
@@ -102,6 +98,10 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 	{
 		print $db->error();
 	}
+	if (! dolibarr_set_const($db, 'LDAP_SYNCHRO_ACTIVE',$_POST["activesynchro"]))
+	{
+		print $db->error();
+	}
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contact"]))
 	{
 		print $db->error();
@@ -110,11 +110,15 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 	{
 		print $db->error();
 	}
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"]))
+	{
+		print $db->error();
+	}
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"]))
 	{
 		print $db->error();
 	}
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_REALNAME',$_POST["fieldrealname"]))
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"]))
 	{
 		print $db->error();
 	}
@@ -126,11 +130,19 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 	{
 		print $db->error();
 	}
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"]))
+	{
+		print $db->error();
+	}
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"]))
+	{
+		print $db->error();
+	}
 	if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"]))
 	{
 		print $db->error();
 	}
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"]))
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"]))
 	{
 		print $db->error();
 	}
@@ -190,19 +202,19 @@ $arraylist=array();
 $arraylist['3']='Version 3';
 $arraylist['2']='Version 2';
 $html->select_array('version',$arraylist,$conf->global->LDAP_SERVER_PROTOCOLVERSION);
-print '</td><td>&nbsp;</td></tr>';
+print '</td><td>'.$langs->trans("LDAPServerProtocolVersion").'</td></tr>';
 
-// Serveur
+// Serveur primaire
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("LDAPServer").'</td><td>';
+print $langs->trans("LDAPPrimaryServer").'</td><td>';
 print '<input size="25" type="text" name="host" value="'.$conf->global->LDAP_SERVER_HOST.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
-// Serveur
+// Serveur secondaire
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("LDAPServerSlave").'</td><td>';
+print $langs->trans("LDAPSecondaryServer").'</td><td>';
 print '<input size="25" type="text" name="slave" value="'.$conf->global->LDAP_SERVER_HOST_SLAVE.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
@@ -221,15 +233,15 @@ print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
 
 // DNserver
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNServer").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerDn").'</td><td>';
 print '<input size="25" type="text" name="dn" value="'.$conf->global->LDAP_SERVER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPServerDnExample").'</td></tr>';
 
 // DNAdmin
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNAdmin").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
 print '<input size="25" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
-print '</td><td>&nbsp;</td></tr>';
+print '</td><td>'.$langs->trans("LDAPAdminDnExample").'</td></tr>';
 
 // Pass
 $var=!$var;
@@ -246,7 +258,7 @@ print '</td><td>&nbsp;</td></tr>';
 
 // Utiliser TLS
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPUseTLS").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
 $arraylist['1']=$langs->trans("Yes");
@@ -260,18 +272,19 @@ print "</tr>\n";
 
 // Synchro utilisateurs/groupes active
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNUserGroupActive").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnSynchroActive").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
-$arraylist['1']=$langs->trans("Yes");
-$html->select_array('activecontact',$arraylist,$conf->global->LDAP_USERGROUP_ACTIVE);
-print '</td><td>'.$langs->trans("NotYetAvailable").'</td></tr>';
+$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr");
+$arraylist['dolibarr2ldap']=$langs->trans("DolibarrToLDAP");
+$html->select_array('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE);
+print '</td><td>'.$langs->trans("LDAPDnSynchroActiveExample").'</td></tr>';
 
 // DN Pour les utilisateurs
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNUser").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPUserDn").'</td><td>';
 print '<input size="25" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
-print '</td><td>'.$langs->trans("DNUserExample").'</td></tr>';
+print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td></tr>';
 
 // Champ de login
 $var=!$var;
@@ -301,9 +314,9 @@ print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td></tr>';
 
 // DN pour les groupes
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNGroup").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPGroupDn").'</td><td>';
 print '<input size="25" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
-print '</td><td>'.$langs->trans("DNGroupExample").'</td></tr>';
+print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td></tr>';
 
 
 print '<tr class="liste_titre">';
@@ -312,24 +325,37 @@ print "</tr>\n";
 
 // Synchro contact active
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNContactActive").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
 $arraylist['1']=$langs->trans("Yes");
 $html->select_array('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE);
-print '</td><td>'.$langs->trans("DNContactActiveExample").'</td></tr>';
+print '</td><td>'.$langs->trans("LDAPDnContactActiveExample").'</td></tr>';
 
 // DN Pour les contacts
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("DNContact").'</td><td>';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPContactDn").'</td><td>';
 print '<input size="25" type="text" name="contact" value="'.$conf->global->LDAP_CONTACT_DN.'">';
-print '</td><td>'.$langs->trans("DNContactExample").'</td></tr>';
+print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td></tr>';
 
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("ConnectionDolibarrLdap").'</td>';
+print '<td colspan="3">'.$langs->trans("LDAPAttributes").'</td>';
 print "</tr>\n";
 
-// SAMAccountName
+// Login
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
+if ($conf->global->LDAP_FIELD_LOGIN_SAMBA)
+{
+  print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_FIELD_LOGIN_SAMBA.'">';
+}
+else
+{
+  print '<input size="25" type="text" name="fieldloginsamba" value="samaccountname">';
+}
+print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td></tr>';
+
+// Name
 $var=!$var;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 if ($conf->global->LDAP_FIELD_NAME)
@@ -338,22 +364,22 @@ if ($conf->global->LDAP_FIELD_NAME)
 }
 else
 {
-  print '<input size="25" type="text" name="fieldname" value="samaccountname">';
+  print '<input size="25" type="text" name="fieldname" value="sn">';
 }
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td></tr>';
 
-// RealName
+// Firstname
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldRealName").'</td><td>';
-if ($conf->global->LDAP_FIELD_REALNAME)
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
+if ($conf->global->LDAP_FIELD_FIRSTNAME)
 {
-  print '<input size="25" type="text" name="fieldrealname" value="'.$conf->global->LDAP_FIELD_REALNAME.'">';
+  print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_FIELD_FIRSTNAME.'">';
 }
 else
 {
-  print '<input size="25" type="text" name="fieldrealname" value="name">';
+  print '<input size="25" type="text" name="fieldfirstname" value="givenname">';
 }
-print '</td><td>'.$langs->trans("LDAPFieldRealNameExample").'</td></tr>';
+print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td></tr>';
 
 // Mail
 $var=!$var;
@@ -381,6 +407,32 @@ else
 }
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td></tr>';
 
+// Fax
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
+if ($conf->global->LDAP_FIELD_FAX)
+{
+  print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_FIELD_FAX.'">';
+}
+else
+{
+  print '<input size="25" type="text" name="fieldfax" value="facsimiletelephonenumber">';
+}
+print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td></tr>';
+
+// Mobile
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
+if ($conf->global->LDAP_FIELD_MOBILE)
+{
+  print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_FIELD_MOBILE.'">';
+}
+else
+{
+  print '<input size="25" type="text" name="fieldmobile" value="mobile">';
+}
+print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td></tr>';
+
 
 print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 08065797bf2..e36febe917e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,34 +434,60 @@ AdherentMailRequired=EMail required to create a new member
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPFunctionsNotAvailableOnPHP=LDAP functions are not availbale on your PHP
-LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr users and groups to LDAP
+LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr or LDAP users and groups
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
 LDAPSynchronizeContacts=Synchronize Dolibarr contacts to LDAP
 LDAPTypeExample=OpenLdap, Egroupware or Active Directory
-LDAPServer=LDAP Server
+LDAPPrimaryServer=LDAP primary server
+LDAPSecondaryServer=LDAP secondary server
 LDAPServerPort=LDAP server port
 LDAPServerPortExample=Default port : 389
-#LDAPSuffix=LDAP suffix
-DNAdmin=Administrator DN
+LDAPServerProtocolVersion=LDAP protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=com)
 LDAPPassword=administrator password
-DNUser=Dolibarr users' DN
-DNGroup=Dolibarr groups' DN
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=com)
 LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-#LDAPSuffixExample=Complete DN (ex: dc=company,dc=com)
-DNAdminExample=Complete DN (ex: cn=adminldap,dc=society,dc=com)
+LDAPServerDnExample=Complete DN (ex: dc=company,dc=com)
 LDAPPasswordExample=Admin password
-DNUserGroupActive=Users and groups synchronization
-DNUserExample=Complete DN (ex: ou=users,dc=society,dc=com)
-DNGroupExample=Complete DN (ex: ou=groups,dc=society,dc=com)
-DNContactActive=Contacts' synchronization
-DNContactActiveYes=Activated synchronization
-DNContactActiveExample=Activated/Unactivated synchronization
-DNContact=Dolibarr contacts' DN
-DNContactExample=Complete DN (ex: ou=contacts,dc=society,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveYes=Activated synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com)
 LDAPTestConnect=Test LDAP connection
 LDAPTestOK=Connect to LDAP server successful
 LDAPTestKO=Connect to LDAP server failed
 LDAPSetupForVersion3=LDAP server configured for version 3
 LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPFieldLogin=Login attribute
+LDAPFieldLoginExample=Default attribute : uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Default filter : &(objectClass=user)(objectCategory=person)
+LDAPAttributes=LDAP attributes
+LDAPFieldLoginSamba=Login
+LDAPFieldLoginSambaExample=Default attribute : samaccountname (Samba and ActiveDirectory)
+LDAPFieldName=Name
+LDAPFieldNameExample=Default attribute : sn
+LDAPFieldFirstName=Firstname
+LDAPFieldFirstNameExample=Default attribute : givenname
+LDAPFieldMail=E-Mail address
+LDAPFieldMailExample=Default attribute : mail
+LDAPFieldPhone=Phone number
+LDAPFieldPhoneExample=Default attribute : telephonenumber
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Default attribute : facsimiletelephonenumber
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Default attribute : mobile
 ##### Products #####
 ProductSetup=Products module setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1162e5b1b82..c9817956b0b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -434,34 +434,60 @@ AdherentMailRequired=EMail obligatoire pour cr
 ##### LDAP setup #####
 LDAPSetup=Configuration du module LDAP
 LDAPFunctionsNotAvailableOnPHP=Les fonctions LDAP ne sont pas disponibles sur votre PHP
-LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr vers LDAP
+LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr ou LDAP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
 LDAPSynchronizeContacts=Synchronisation des contacts Dolibarr vers LDAP
 LDAPTypeExample=OpenLdap, Egroupware ou Active Directory
-LDAPServer=Serveur LDAP
+LDAPPrimaryServer=Serveur primaire
+LDAPSecondaryServer=Serveur secondaire
 LDAPServerPort=Port du serveur LDAP
 LDAPServerPortExample=Port par défaut : 389
-#LDAPSuffix=Suffix LDAP
-DNAdmin=DN de l'administrateur
+LDAPServerProtocolVersion=Version du protocole LDAP
+LDAPServerUseTLS=Utiliser TLS
+LDAPServerUseTLSExample=Votre serveur utilise le TLS
+LDAPServerDn=DN du serveur
+LDAPAdminDn=DN de l'administrateur
+LDAPAdminDnExample=DN complet (ex: cn=adminldap,dc=societe,dc=com)
 LDAPPassword=Mot de passe de l'administrateur
-DNUser=DN des utilisateurs Dolibarr
-DNGroup=DN des groupes Dolibarr
+LDAPUserDn=DN des utilisateurs
+LDAPUserDnExample=DN complet (ex: ou=users,dc=societe,dc=com)
+LDAPGroupDn=DN des groupes
+LDAPGroupDnExample=DN complet (ex: ou=groups,dc=societe,dc=com)
 LDAPServerExample=Adresse du serveur (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-#LDAPSuffixExample=DN complet (ex: dc=societe,dc=com)
-DNAdminExample=DN complet (ex: cn=adminldap,dc=societe,dc=com)
+LDAPServerDnExample=DN complet (ex: dc=societe,dc=com)
 LDAPPasswordExample=Mot de passe de l'administrateur
-DNUserGroupActive=Synchronisation des utilisateurs et groupes
-DNUserExample=DN complet (ex: ou=users,dc=societe,dc=com)
-DNGroupExample=DN complet (ex: ou=groups,dc=societe,dc=com)
-DNContactActive=Synchronisation des contacts
-DNContactActiveYes=Synchronisation activée
-DNContactActiveExample=Synchronisation activée/désactivée
-DNContact=DN des contacts Dolibarr
-DNContactExample=DN complet (ex: ou=contacts,dc=societe,dc=com)
+LDAPDnSynchroActive=Synchronisation des utilisateurs et groupes
+LDAPDnSynchroActiveExample=Synchronisation de LDAP vers Dolibarr ou Dolibarr vers LDAP
+LDAPDnContactActive=Synchronisation des contacts
+LDAPDnContactActiveYes=Synchronisation activée
+LDAPDnContactActiveExample=Synchronisation activée/désactivée
+LDAPContactDn=DN des contacts Dolibarr
+LDAPContactDnExample=DN complet (ex: ou=contacts,dc=societe,dc=com)
 LDAPTestConnect=Tester la connexion LDAP
 LDAPTestOK=Connexion au serveur LDAP réussie
 LDAPTestKO=Connexion au serveur LDAP echouée
 LDAPSetupForVersion3=Serveur LDAP configuré en version 3
 LDAPSetupForVersion2=Serveur LDAP configuré en version 2
+LDAPFieldLogin=Attribut du Login
+LDAPFieldLoginExample=Attribut par défaut : uid
+LDAPFilterConnection=Filtre de recherche
+LDAPFilterConnectionExample=Filtre par défaut : &(objectClass=user)(objectCategory=person)
+LDAPAttributes=Attributs LDAP
+LDAPFieldLoginSamba=Login
+LDAPFieldLoginSambaExample=Attribut par défaut : samaccountname (Samba et ActiveDirectory)
+LDAPFieldName=Nom
+LDAPFieldNameExample=Attribut par défaut : sn
+LDAPFieldFirstName=Prénom
+LDAPFieldFirstNameExample=Attribut par défaut : givenname
+LDAPFieldMail=Adresse E-Mail
+LDAPFieldMailExample=Attribut par défaut : mail
+LDAPFieldPhone=Numéro de téléphone
+LDAPFieldPhoneExample=Attribut par défaut : telephonenumber
+LDAPFieldFax=Numéro de fax
+LDAPFieldFaxExample=Attribut par défaut : facsimiletelephonenumber
+LDAPFieldMobile=Téléphone portable
+LDAPFieldMobileExample=Attribut par défaut : mobile
 ##### Products #####
 ProductSetup=Configuration du module Produits
 NumberOfProductShowInSelect=Nombre de produits max dans les listes déroulantes (0=aucune limite)
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index f405bb4ee96..173a5213388 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -202,8 +202,8 @@ if ($_POST["action"] == 'update' && $caneditfield)
     $edituser->pass          = trim($_POST["pass"]);
     $edituser->admin         = trim($_POST["admin"]);
     $edituser->office_phone  = trim($_POST["office_phone"]);
- 	$edituser->office_fax    = trim($_POST["office_fax"]);
- 	$edituser->user_mobile   = trim($_POST["user_mobile"]);
+ 	  $edituser->office_fax    = trim($_POST["office_fax"]);
+ 	  $edituser->user_mobile   = trim($_POST["user_mobile"]);
     $edituser->email         = trim($_POST["email"]);
     $edituser->note          = trim($_POST["note"]);
     $edituser->webcal_login  = trim($_POST["webcal_login"]);