PLFM-267: modified workflow. do not actually change email until after validation