Watcher improvements, removed archive user restriction