Fix email confirmation resend and email change