Added support for username being passed in querystring