Fix issue with not having set the registrant entity for the notification service. Clean up messages too
Fix issue with not having set the registrant entity for the notification service. Clean up messages too
Fix issue with not having set the registrant entity for the notification service. Clean up messages too