PLFM-267: first round to give the ability to change email address