--- LdapPrincipalDaoImpl-orig.java	2007-12-22 04:13:38.000000000 +0100
+++ LdapPrincipalDaoImpl.java	2008-01-09 18:05:44.000000000 +0100
@@ -355,9 +355,14 @@
 	}
 	
 	protected String getUserDN(String userPrincipalUid, boolean includeBaseDN) {
-		String userDN = getUserIdAttribute() + "=" + userPrincipalUid;
-		if (!StringUtils.isEmpty(getUserFilterBase()))
-			userDN += "," + getUserFilterBase();
+		String userDN = "";
+		try{
+			userDN = lookupByUid(userPrincipalUid);
+		}
+		catch (SecurityException e) {
+			// do nothing; security has been already checked
+		}
+		
 		if (includeBaseDN && !StringUtils.isEmpty(getRootContext()))
 			userDN += "," + getRootContext();
 		return userDN;