Fixes e-mail address change workflow. Moreover, we should not remove activation tokens to be able to disable users.