report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes