diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 4d9a779d579..a5f61a45642 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -191,12 +191,12 @@ if ($result > 0)
 	}
     else
     {
-    	$records=$ldap->getAttribute($dn,$search);
+    	$records = $ldap->getAttribute($dn,$search);
 
     	//print_r($records);
 
     	// Affichage arbre
-    	if (count($records) && $records != false && (! isset($records['count']) || $records['count'] > 0))
+    	if ((! is_numeric($records) || $records != 0) && (! isset($records['count']) || $records['count'] > 0))
     	{
     		if (! is_array($records))
     		{
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index a626c57b6af..af8fccfd7b9 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -170,12 +170,12 @@ if ($result > 0)
 	$info=$object->_load_ldap_info();
 	$dn=$object->_load_ldap_dn($info,1);
 	$search = "(".$object->_load_ldap_dn($info,2).")";
-	$records=$ldap->getAttribute($dn,$search);
+	$records = $ldap->getAttribute($dn,$search);
 
 	//var_dump($records);
 
 	// Affichage arbre
-	if (count($records) && $records != false && (! isset($records['count']) || $records['count'] > 0))
+    if ((! is_numeric($records) || $records != 0) && (! isset($records['count']) || $records['count'] > 0))
 	{
 		if (! is_array($records))
 		{
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 8ea3221c648..f3845734ec5 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -823,7 +823,7 @@ class Ldap
 	 *
 	 *	@param	string	$dn			DN entry key
 	 *	@param	string	$filter		Filter
-	 *	@return	int|false|array					<0 or false if KO, array if OK
+	 *	@return	int|array			<0 or false if KO, array if OK
 	 */
 	function getAttribute($dn,$filter)
 	{
@@ -848,7 +848,7 @@ class Ldap
 		{
 			$this->ldapErrorCode = -1;
 			$this->ldapErrorText = "Couldn't find entry";
-			return false;  // Couldn't find entry...
+			return 0;  // Couldn't find entry...
 		}
 
 		// Get values
@@ -856,7 +856,7 @@ class Ldap
 		{
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
-			return false; // No matching attributes
+			return 0; // No matching attributes
 		}
 
 		// Return an array containing the attributes.
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 199041551c5..bf39a128137 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -177,7 +177,7 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Affichage arbre
-	if (count($records) && $records != false && (! isset($records['count']) || $records['count'] > 0))
+    if ((! is_numeric($records) || $records != 0) && (! isset($records['count']) || $records['count'] > 0))
 	{
 		if (! is_array($records))
 		{
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index e8a6a8fc1c9..1da5911861c 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -181,12 +181,12 @@ if ($result > 0)
     $info=$object->_load_ldap_info();
     $dn=$object->_load_ldap_dn($info,1);
     $search = "(".$object->_load_ldap_dn($info,2).")";
-    $records=$ldap->getAttribute($dn,$search);
+    $records = $ldap->getAttribute($dn,$search);
 
     //print_r($records);
 
     // Affichage arbre
-    if (count($records) && $records != false && (! isset($records['count']) || $records['count'] > 0))
+    if ((! is_numeric($records) || $records != 0) && (! isset($records['count']) || $records['count'] > 0))
     {
         if (! is_array($records))
         {