Fixed bug with username