diff --git a/src/cloudron.js b/src/cloudron.js
index 3a2cdd30b..877390ca7 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -31,6 +31,7 @@ var assert = require('assert'),
     reverseProxy = require('./reverseproxy.js'),
     safe = require('safetydance'),
     settings = require('./settings.js'),
+    setup = require('./setup.js'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
@@ -102,6 +103,9 @@ function runStartupTasks() {
     // configure nginx to be reachable by IP
     reverseProxy.configureDefaultServer(NOOP_CALLBACK);
 
+    // always generate webadmin config since we have no versioning mechanism for the ejs
+    setup.configureWebadmin(NOOP_CALLBACK);
+
     // check activation state and start the platform
     users.isActivated(function (error, activated) {
         if (error) return debug(error);
diff --git a/src/server.js b/src/server.js
index 2f217d095..4969956b9 100644
--- a/src/server.js
+++ b/src/server.js
@@ -19,7 +19,6 @@ var accesscontrol = require('./accesscontrol.js'),
     passport = require('passport'),
     path = require('path'),
     routes = require('./routes/index.js'),
-    setup = require('./setup.js'),
     ws = require('ws');
 
 var gHttpServer = null;
@@ -361,7 +360,6 @@ function start(callback) {
         routes.accesscontrol.initialize,  // hooks up authentication strategies into passport
         database.initialize,
         cloudron.initialize,
-        setup.configureWebadmin,
         gHttpServer.listen.bind(gHttpServer, config.get('port'), '127.0.0.1'),
         gSysadminHttpServer.listen.bind(gSysadminHttpServer, config.get('sysadminPort'), '127.0.0.1'),
         eventlog.add.bind(null, eventlog.ACTION_START, { userId: null, username: 'boot' }, { version: config.version() })