ref #4155 - allow subscriber email editing
general - other minor bug fix