Fixed email update issue