MIFOSX-900 - Fixed checks when de-activating or removing charges