Otherwise we can end up collecting invalid email addresses… This required some refactoring to allow our email fields to be optional (but not by default).