Minor bug fix to not append '@gmail.com' to usernames of '---' (special case).