Changed the way we watch for the current user