3962 Restore Change Email link and remove unneeded logic
Merge pull request #1603 from sarken/issue_3493

3962 Restore Change Email link and remove unneeded logic