Renamed and added support for passing the username.