New email settings
New email template
Activate account functionality
Merged changes update to CF-4