PShrestha: UserId added