Fix re-direct on enable/disable