Revert "Make email not mandatory"

This reverts commit 82f9a02c3d8b800f764a2f664a5481e834476913.
Add user email scope