properly send email as nameid
Merge branch 'sso/clickview'