m more caps email fixes
Add email params to settings.
Merge branch 'master' into staging