minor refactoring around custom user notifications