company name isn't editable, address 2 was missing from list of fields (bug 935131)