Fixed user not being asked for password during setup
Merge pull request #1200 from ianrenton/master

Fixed user not being asked for password during setup