porting Carson's upgrade
removing create user flag