Be a bit less eager about creating the user database: now we only create it when explicitly asked to use it with --user.