Fixed New User Wizard bugs