CBSA should require affirmative opt-in to use the shipper as the broker, and allow you to file the paperwork yourself on their site.