Update roles collection after save and fix return values