Fixed bug with Username