Added user notification email support