Switching to only using confirmed email addresses