Added the option to use a username and password