S66766 adding sub and user id
Merge pull request #21 from mnovinger/master

S66766 adding sub and user id