Add ability to set username