Fix userId reference