fix bug 1072989 - use user factory more.