Fixed watch_button to work with anonymous users