Fix using username and password provided on logon. (WIP)