Merge "Revert "Prevent new users from being sent emails""