More user_id & account_id scoping