FIxing errors with email on user sign-on.
Merge remote-tracking branch 'origin/amit' into amit