Fixed issue with space usernames