Fixes for ldap -> openldap user switch.