diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php
index 61e192485..2044b41a1 100644
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -622,7 +622,7 @@ class DBObjectSearch extends DBSearch
 		{
 			if (!$oAttDef->IsScalar()) continue;
 			if ($oAttDef->IsExternalKey()) continue;
-			if ($oAttDef instanceof AttributePassword) continue;
+			if (!$oAttDef->IsSearchable()) continue;
 			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
 		}
 		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);