Add option to disable email sending