Fixes issues with multi-domain accounts and billing admins