safer,complete sync of emailaddress/profile, tests
Merge pull request #1739 from ischneider/iss-1733

safer,complete sync of emailaddress/profile, tests