Change the way to handle email changed by user