Fix for usernames with spaces