Minor fix to avoid inbox bug when adding payment gateway later