SOC-3472 | Notification Emails - Improvement code