Fix name and email updating

Also includes minor cleanup
Merge pull request #5476 from edx/renzo/fix-name-and-email-updating

Fix name and email updating