Refs #20076 Adopt new api for 'compnies for user'. Fix role setting