Changed the way username and password are set