diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
index c801c9e67be9302f9ba2f29c96498531a9de3fb9..330253a7c98762ed15ed79d2df31526c91f4e120 100644
--- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -10,12 +10,16 @@ import hudson.util.spring.BeanBuilder;
 import net.sf.json.JSONObject;
 import org.acegisecurity.AuthenticationManager;
 import org.acegisecurity.userdetails.UserDetailsService;
+import org.acegisecurity.userdetails.UserDetails;
+import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch;
+import org.acegisecurity.ldap.LdapUserSearch;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.springframework.web.context.WebApplicationContext;
+import org.springframework.dao.DataAccessException;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -127,10 +131,16 @@ public class LDAPSecurityRealm extends SecurityRealm {
 
         BeanBuilder builder = new BeanBuilder();
         builder.parse(Hudson.getInstance().servletContext.getResourceAsStream("/WEB-INF/security/LDAPBindSecurityRealm.groovy"),binding);
-        WebApplicationContext appContext = builder.createApplicationContext();
+        final WebApplicationContext appContext = builder.createApplicationContext();
+
         return new SecurityComponents(
             findBean(AuthenticationManager.class, appContext),
-            findBean(UserDetailsService.class, appContext));
+            new UserDetailsService() {
+                final LdapUserSearch ldapSerach = findBean(LdapUserSearch.class, appContext);
+                public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
+                    return ldapSerach.searchForUser(username);
+                }
+            });
     }
 
     public DescriptorImpl getDescriptor() {
diff --git a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy
index 568e7f5128e6b2133a7a94877ef90ab04dab076d..244b115bdf735391403f0a25a29e70b88c910d5f 100644
--- a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy
+++ b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy
@@ -28,10 +28,14 @@ bindAuthenticator(BindAuthenticator,initialDirContextFactory) {
 //    "uid={0},ou=people"
 //  ]
     // this is when we need to find it.
-    userSearch = bean(FilterBasedLdapUserSearch, instance.userSearchBase, instance.userSearch, initialDirContextFactory) {
-        searchSubtree=true
-    }
+    userSearch = ldapUserSearch;
 }
+
+ldapUserSearch(FilterBasedLdapUserSearch, instance.userSearchBase, instance.userSearch, initialDirContextFactory) {
+    searchSubtree=true
+}
+
+
 authoritiesPopulator(DefaultLdapAuthoritiesPopulator,initialDirContextFactory,"ou=groups") {
   // groupRoleAttribute = "ou";
 }