Bug fix: Bootstrap fails when w/o CreateUser switch