Added more customization options for notification and welcome emails