Confirm and complete email change requests
Add tests and new, more standard email templates