fixed '@' issue with username