Fix for ss 2.4
Fix for email receipts