CLI: Make sure that en/disable errors are marked as such

fixes #7379