LPS-40853 Pass userId as a parameter