add account activations
Add password resets & email configuration
resolve conflicts