Add ability to use a different username