diff --git a/Makefile b/Makefile
index e5fa8125d49..4f2b551942a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 # General Makefile
 #
 
-FILE=dolibarr-1.1.0
+FILE=dolibarr-1.2.0-cvs
 
 tar:
 	rm -fr dolibarr-*.tar.gz* $(FILE)
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 36e46e32027..7243fdf23d2 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -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>DN</td><td>'.LDAP_SERVER_LOGIN.'</td></tr>';
-print '<tr><td>DN</td><td>'.LDAP_SERVER_PASS.'</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 '</table>';
 
@@ -119,6 +119,7 @@ if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && $_GET["action"] == 'test'
       //ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 
       $ldapbind = dolibarr_ldap_bind($ds);
+
       if ($ldapbind)
 	{
 	  print "bind ok<br>";