Correct issue with email lost on accounts merger - the right way