various changes to fix users registering their email address initially and being able to change it via settings later