Fix changes in LDAP and Bugs in user