more anonymous email fixes