Fixed issues with username
Fixed issues with username