Correctly handle usernames with spaces