PLFM-267: changes to allow user to change email address. does not change email until after email address validation.