Currently, if a user change his email, with a wrong email, and the activation is set to email activation, he can't recover access to his account without admin intervention.

I think that we should change this behaviour and don't disable account on email change. We can create a field in the user table that contain the new email, and set this email as user email when the user click on the link in the activation mail.