Vendor Assignment flow fix