diff --git a/lam/lib/ldap.inc b/lam/lib/ldap.inc
index 70481fd4..dc7ded06 100644
--- a/lam/lib/ldap.inc
+++ b/lam/lib/ldap.inc
@@ -115,11 +115,11 @@ class Ldap{
function search_username($name) {
if ($this->conf->get_samba3() == "yes") {
// users have the attribute "posixAccount" or "sambaSamAccount" and uid $name
- $filter = "(&(|(objectClass=posixAccount) (objectClass=sambaSamAccount)) (uid=$name))";
+ $filter = "(&(objectClass=sambaSamAccount) (uid=$name))";
}
else {
// users have the attribute "posixAccount" or "sambaAccount" and uid $name
- $filter = "(&(|(objectClass=posixAccount) (objectClass=sambaAccount)) (uid=$name))";
+ $filter = "(&(objectClass=sambaAccount) (uid=$name))";
}
$attrs = array();
$sr = @ldap_search($this->server, $this->conf->get_UserSuffix(), $filter, $attrs);
diff --git a/lam/templates/lists/userlink.php b/lam/templates/lists/userlink.php
index 61d0e0de..b8524d73 100644
--- a/lam/templates/lists/userlink.php
+++ b/lam/templates/lists/userlink.php
@@ -51,7 +51,7 @@ else {
echo "userlink\n";
echo "\n";
echo "\n";
- echo StatusMessage("ERROR", "", _("This user was not found or is invalid!") . " " . $user);
+ echo StatusMessage("ERROR", "", _("This user was not found!") . " (" . $user . ")");
echo ("\n");
}