Refactoring
Add email field for standard authentication policy