Further work on email change request.  Still incomplete.