:beers: fixing add watches of any current_user