Index: components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java
===================================================================
--- components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java	(revision 596998)
+++ components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java	(working copy)
@@ -207,8 +207,11 @@
         {
             SearchResult searchResult = (SearchResult) searchResults.next();
             userDn = searchResult.getName();
-            // FIXME: Does this work?
-            userDn += "," + StringUtils.replace(getSearchDomain(), "," + getRootContext(), "");
+            String searchDomain = getSearchDomain();
+            if (searchDomain.length() > 0)
+            {
+                userDn += "," + StringUtils.replace(searchDomain, "," + getRootContext(), "");
+            }
         }
         return userDn;
     }