BISERVER-8223- Fixed LDAP scenario