Payment: improving payment emails and logic