#5 Invoices and user form fix