Adding support for specified username and password