A more reliable way of making sure we have the correct email address.