Minor update to some of the files plus AddUser

- Wizard now has a step to add user accounts during prepping process