fix userId tracking bug