Fixed strange username functionality