Added support for usernames with spaces