diff --git a/ihtml/themes/breezy/simple-filter.tpl b/ihtml/themes/breezy/simple-filter.tpl
index ce7a74c7b61b6523a53d7233d6a842ed54c32df9..86b432d458ef7f6691f5a040ba168b441892197f 100644
--- a/ihtml/themes/breezy/simple-filter.tpl
+++ b/ihtml/themes/breezy/simple-filter.tpl
@@ -13,7 +13,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 9b17226f8d2a1f3ec3303d3ef52d4eb06a234d6e..d88f8e1070270e2e802861adc6441da80e3754fa 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -375,6 +375,7 @@ class filter
       switch ($element['type']) {
         case "textfield":
           $htmlCode = $this->getTextfield($element);
+          $smarty->assign($tag.'DESC', sprintf(_('Searches in %s'), implode(', ', $element['autocomplete']['attribute'])));
           break;
 
         case "checkbox":
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index 1ad1ba94b84fe0fea7bd3bca623dacce805451d9..72c4977eac787c36b7c8b724775ec1ecc765ab8a 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -149,6 +149,7 @@
       <backend>LDAP</backend>
       <filter>(&amp;(|(objectClass=posixGroup)$ROLE$FILTERTEMPLATE(objectClass=groupOfNames))(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>description</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index b75b215e083631eda2c2689dc7420fffcdc0032c..e99124f3fcb6ee58eedf0a27a2d96d01804c7bb2 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -19,7 +19,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/plugins/admin/users/user-filter.xml b/plugins/admin/users/user-filter.xml
index ef78f3fa54190b362fccb08e1cbce3c586c45996..0160c99400a63aee301f7e6e39fcad1d57e0e7e7 100644
--- a/plugins/admin/users/user-filter.xml
+++ b/plugins/admin/users/user-filter.xml
@@ -29,7 +29,10 @@
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=inetOrgPerson)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)(mail=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>givenName</attribute>
       <attribute>uid</attribute>
+      <attribute>mail</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>