Moving last change up into CustomLdapUserDetailsService