Improve email change to be able to put a specific form