fix bug 1072989 - use user factory more.
Merge pull request #2794 from jezdez/bug1072989

fix bug 1072989 - use user factory more.