Jfg414 and Jfg437

JFG 414 - restore correct creation of User objects