diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 7243fdf23d2..23b559be77b 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -31,11 +31,11 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 
   $db->query($sql);
 
-  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_LOGIN', value='".$HTTP_POST_VARS["login"]."', visible=0";
+  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_PASS', value='".$HTTP_POST_VARS["pass"]."', visible=0";
 
   $db->query($sql);
 
-  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_PASS', value='".$HTTP_POST_VARS["pass"]."', visible=0";
+  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_TYPE', value='".$HTTP_POST_VARS["type"]."', visible=0";
 
   $db->query($sql);
 
@@ -73,8 +73,8 @@ print "</tr>\n";
 print '<tr><td>Serveur LDAP</td><td>'.LDAP_SERVER_HOST.'</td></tr>';
 
 print '<tr><td>DN</td><td>'.LDAP_SERVER_DN.'</td></tr>';
-print '<tr><td>Login</td><td>'.LDAP_SERVER_LOGIN.'</td></tr>';
 print '<tr><td>Pass</td><td>'.LDAP_SERVER_PASS.'</td></tr>';
+print '<tr><td>Type</td><td>'.LDAP_SERVER_TYPE.'</td></tr>';
 
 print '</table>';
 
@@ -94,19 +94,22 @@ print '</td></tr>';
 print '<tr><td>DN</td><td>';
 print '<input size="25" type="text" name="dn" value="'.LDAP_SERVER_DN.'">';
 print '</td></tr>';
-print '<tr><td>Login</td><td>';
-print '<input size="25" type="text" name="login" value="'.LDAP_SERVER_LOGIN.'">';
-print '</td></tr>';
 print '<tr><td>Pass</td><td>';
 print '<input size="25" type="text" name="pass" value="'.LDAP_SERVER_PASS.'">';
 print '</td></tr>';
 
+print '<tr><td><select name="type">';
+print '<option value="openldap" selected>OpenLdap';
+print '<option value="egroupware">Egroupware';
+print '</select>';
+print '</td></tr>';
+
 print '<tr><td><input type="submit" value="changer"></td></tr>';
 print '</table></form>';
 
 print '</td></tr></table>';
 
-print '<a href="ldap.php?action=test">test</a><br>';
+print '<a href="ldap.php?action=test">test de connection</a><br>';
 
 if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && $_GET["action"] == 'test')
 {
@@ -114,25 +117,25 @@ if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && $_GET["action"] == 'test'
 
   if ($ds)
     {
-      print "connect ok<br>";
+      print "connection réussie<br>";
 
-      //ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+      ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 
       $ldapbind = dolibarr_ldap_bind($ds);
 
       if ($ldapbind)
 	{
-	  print "bind ok<br>";
+	  print "connection au dn réussi<br>";
 	}
       else
 	{
-	  print "bind erreur<br>";
+	  print "connection au dn raté<br>";
 	}
       ldap_close($ds);
     }
   else
     {
-      print "connect erreur<br>";
+      print "connection échouée<br>";
     }
 }
 
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index 53e0bcb6d1d..ce7dbcde191 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -129,12 +129,13 @@ class Contact
 	ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 	
 	$ldapbind = dolibarr_ldap_bind($ds);
-	
+
 	if ($ldapbind)
 	  {
 	    $info["cn"] = utf8_encode($this->firstname." ".$this->name);
 	    $info["sn"] = utf8_encode($this->name);
-	    
+	    $info["ou"] = "People";
+
 	    if ($this->email)
 	      $info["rfc822Mailbox"] = $this->email;
 		  
@@ -149,7 +150,7 @@ class Contact
 	    
 	    if ($this->poste)
 	      $info["title"] = utf8_encode($this->poste);
-	    
+
 	    if ($this->socid > 0)
 	      {
 		$soc = new Societe($this->db);
@@ -160,32 +161,32 @@ class Contact
 		    $info["l"] = utf8_encode($soc->ville);
 		  }
 	      }
-	    
+
 	    $info["objectclass"][0] = "organizationalPerson";
 	    $info["objectclass"][1] = "inetOrgPerson";
-	    $info["objectclass"][2] = "phpgwContact"; // compatibilite egroupware
-	    
-	    $info['uidnumber'] = $this->id;
-	    
-	    $info['phpgwTz']      = 0;
-	    $info['phpgwMailType'] = 'INTERNET';
-	    $info['phpgwMailHomeType'] = 'INTERNET';
-	    
+//	    $info["objectclass"][2] = "phpgwContact"; // compatibilite egroupware
+
+//	    $info['uidnumber'] = $this->id;
+
+//	    $info['phpgwTz']      = 0;
+//	    $info['phpgwMailType'] = 'INTERNET';
+//	    $info['phpgwMailHomeType'] = 'INTERNET';
+
 	    $info["uid"] = $this->id. ":".$info["sn"];
-	    $info["phpgwContactTypeId"] = 'n';
-	    $info["phpgwContactCatId"] = 0;
-	    $info["phpgwContactAccess"] = "public";
-	    $info["phpgwContactOwner"] = $user->egroupware_id;
+//	    $info["phpgwContactTypeId"] = 'n';
+//	    $info["phpgwContactCatId"] = 0;
+//	    $info["phpgwContactAccess"] = "public";
+//	    $info["phpgwContactOwner"] = $user->egroupware_id;
 	    $info["givenName"] = utf8_encode($this->firstname);
-	    
-	    if ($this->phone_mobile)
-	      $info["phpgwCellTelephoneNumber"] = dolibarr_print_phone($this->phone_mobile);
-	    
+
+//	    if ($this->phone_mobile)
+//	      $info["phpgwCellTelephoneNumber"] = dolibarr_print_phone($this->phone_mobile);
+
 	    //$dn = "uid=".$info["uid"].","."cn=".$info["cn"].", ".LDAP_SERVER_DN ;
-	    $dn = "cn=".$info["cn"].", ".LDAP_SERVER_DN ;
-	    
-	    $r = @ldap_delete($ds, $dn);
-	    
+	    //$dn = "cn=".$info["cn"].", ".LDAP_SERVER_DN ;
+
+	    $r = @ldap_delete($ds, LDAP_SERVER_DN);
+
 	    if (! ldap_add($ds, $dn, $info))
 	      {
 		$this->error[0] = ldap_err2str(ldap_errno($ds));
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index f52f8f64d9f..7d74e12b2b9 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -31,15 +31,15 @@ Function dolibarr_ldap_connect()
 
 Function dolibarr_ldap_bind($ds)
 {
-  if (defined("LDAP_SERVER_PASS") && LDAP_SERVER_PASS)
+  if (defined("LDAP_SERVER_PASS") && LDAP_SERVER_DN && LDAP_SERVER_PASS)
     {
-      $ldapbind = ldap_bind($ds, LDAP_SERVER_LOGIN, LDAP_SERVER_PASS);
+      $ldapbind = ldap_bind($ds, LDAP_SERVER_DN, LDAP_SERVER_PASS);
     }
-  else
+/*  else
     {
-      $ldapbind = ldap_bind($ds, $dn);
+      $ldapbind = ldap_bind($ds, $dn); -- connection anonyme desactivee
     }
-
+*/
   return $ldapbind;
 }