chore(client): Clean up email address markup in confirm screens.

fixes #779 

NOTE: This PR contains #864 with the hope that travis gives the green light.