Refactor user activation/deactivation