Controlling errors when using the token on email change