Fix: log and watch users