diff --git a/src/provision.js b/src/provision.js
index 676222fde..d19e40f48 100644
--- a/src/provision.js
+++ b/src/provision.js
@@ -131,7 +131,7 @@ function setup(dnsConfig, sysinfoConfig, auditSource, callback) {
 
                 async.series([
                     autoRegister.bind(null, domain),
-                    (next) => { if (!sysinfoConfig) return next(); settings.setSysinfoConfig(sysinfoConfig, next); },
+                    settings.setSysinfoConfig.bind(null, sysinfoConfig),
                     domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
                     cloudron.setDashboardDomain.bind(null, domain, auditSource),
                     mail.addDomain.bind(null, domain), // this relies on settings.mailFqdn() and settings.adminDomain()
@@ -239,7 +239,7 @@ function restore(backupConfig, backupId, version, sysinfoConfig, auditSource, ca
             async.series([
                 setProgress.bind(null, 'restore', 'Downloading backup'),
                 backups.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
-                (next) => { if (!sysinfoConfig) return next(); settings.setSysinfoConfig(sysinfoConfig, next); },
+                settings.setSysinfoConfig.bind(null, sysinfoConfig),
                 cloudron.setupDashboard.bind(null, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
                 settings.setBackupConfig.bind(null, backupConfig), // update with the latest backupConfig
                 eventlog.add.bind(null, eventlog.ACTION_RESTORE, auditSource, { backupId }),
diff --git a/src/routes/provision.js b/src/routes/provision.js
index ecee8f57f..ce284927c 100644
--- a/src/routes/provision.js
+++ b/src/routes/provision.js
@@ -58,7 +58,7 @@ function setup(req, res, next) {
     // it can take sometime to setup DNS, register cloudron
     req.clearTimeout();
 
-    provision.setup(dnsConfig, req.body.sysinfoConfig || null, auditSource.fromRequest(req), function (error) {
+    provision.setup(dnsConfig, req.body.sysinfoConfig || { provider: 'generic' }, auditSource.fromRequest(req), function (error) {
         if (error) return next(BoxError.toHttpError(error));
 
         next(new HttpSuccess(200, {}));
@@ -104,7 +104,7 @@ function restore(req, res, next) {
 
     if ('sysinfoConfig' in req.body && typeof req.body.sysinfoConfig !== 'object') return next(new HttpError(400, 'sysinfoConfig must be an object'));
 
-    provision.restore(backupConfig, req.body.backupId, req.body.version, req.body.sysinfoConfig || null, auditSource.fromRequest(req), function (error) {
+    provision.restore(backupConfig, req.body.backupId, req.body.version, req.body.sysinfoConfig || { provider: 'generic' }, auditSource.fromRequest(req), function (error) {
         if (error) return next(BoxError.toHttpError(error));
 
         next(new HttpSuccess(200, {}));