Also remove confirm_email_token when unconfirmed_email is removed.

Fixes #7048

closes #7051