Add password resets & email configuration
Merge branch 'account-activation-password-resets'