fix user id tracking issue