Console: client edit change watcher fix