fixing to for homeless emails
Merge branch 'master' into pinauthintegration