Cosmetic changes.
Added option to disable ldap interactions.