Unified behaviour with corporate/non-corporate sims in MMS

:)