Fixed for usernames with spaces