Wait for user company before getting subcompany

Always check and update cid param if missing