Fix for some usernames