Fix to Generate Form for Company Case