Enabled user authentication and logon/logoff
Resolved merge conflicts