Bug fixes to email change request.