CS-3: Updated settings of invoicing service