diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index 09d615be8..7a41d18f9 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -62,6 +62,7 @@ requestedVersion=""
 installServerOrigin="https://api.cloudron.io"
 apiServerOrigin="https://api.cloudron.io"
 webServerOrigin="https://cloudron.io"
+consoleServerOrigin="https://console.cloudron.io"
 sourceTarballUrl=""
 rebootServer="true"
 setupToken="" # this is a OTP for securing an installation (https://forum.cloudron.io/topic/6389/add-password-for-initial-configuration)
@@ -80,10 +81,12 @@ while true; do
         if [[ "$2" == "dev" ]]; then
             apiServerOrigin="https://api.dev.cloudron.io"
             webServerOrigin="https://dev.cloudron.io"
+            consoleServerOrigin="https://console.dev.cloudron.io"
             installServerOrigin="https://api.dev.cloudron.io"
         elif [[ "$2" == "staging" ]]; then
             apiServerOrigin="https://api.staging.cloudron.io"
             webServerOrigin="https://staging.cloudron.io"
+            consoleServerOrigin="https://console.staging.cloudron.io"
             installServerOrigin="https://api.staging.cloudron.io"
         elif [[ "$2" == "unstable" ]]; then
             installServerOrigin="https://api.dev.cloudron.io"
@@ -209,6 +212,7 @@ fi
 
 mysql -uroot -ppassword -e "REPLACE INTO box.settings (name, value) VALUES ('api_server_origin', '${apiServerOrigin}');" 2>/dev/null
 mysql -uroot -ppassword -e "REPLACE INTO box.settings (name, value) VALUES ('web_server_origin', '${webServerOrigin}');" 2>/dev/null
+mysql -uroot -ppassword -e "REPLACE INTO box.settings (name, value) VALUES ('console_server_origin', '${consoleServerOrigin}');" 2>/dev/null
 
 if [[ -n "${appstoreSetupToken}" ]]; then
     if ! setupResponse=$(curl -sX POST -H "Content-type: application/json" --data "{\"setupToken\": \"${appstoreSetupToken}\"}" "${apiServerOrigin}/api/v1/cloudron_setup_done"); then
diff --git a/src/cloudron.js b/src/cloudron.js
index f876807b0..bac4f13e7 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -155,6 +155,7 @@ async function getConfig() {
     return {
         apiServerOrigin: settings.apiServerOrigin(),
         webServerOrigin: settings.webServerOrigin(),
+        consoleServerOrigin: settings.consoleServerOrigin(),
         adminDomain: settings.dashboardDomain(),
         adminFqdn: settings.dashboardFqdn(),
         mailFqdn: settings.mailFqdn(),
diff --git a/src/settings.js b/src/settings.js
index 05d7aa79f..525eddcc9 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -78,6 +78,7 @@ exports = module.exports = {
     // these values come from the cache
     apiServerOrigin,
     webServerOrigin,
+    consoleServerOrigin,
     dashboardDomain,
     setDashboardLocation,
     setMailLocation,
@@ -121,6 +122,7 @@ exports = module.exports = {
 
     API_SERVER_ORIGIN_KEY: 'api_server_origin',
     WEB_SERVER_ORIGIN_KEY: 'web_server_origin',
+    CONSOLE_SERVER_ORIGIN_KEY: 'console_server_origin',
     DASHBOARD_DOMAIN_KEY: 'admin_domain',
     DASHBOARD_FQDN_KEY: 'admin_fqdn',
     MAIL_DOMAIN_KEY: 'mail_domain',
@@ -754,6 +756,7 @@ async function initCache() {
     gCache = {
         apiServerOrigin: allSettings[exports.API_SERVER_ORIGIN_KEY],
         webServerOrigin: allSettings[exports.WEB_SERVER_ORIGIN_KEY],
+        consoleServerOrigin: allSettings[exports.CONSOLE_SERVER_ORIGIN_KEY],
         dashboardDomain: allSettings[exports.DASHBOARD_DOMAIN_KEY],
         dashboardFqdn: allSettings[exports.DASHBOARD_FQDN_KEY],
         mailDomain: allSettings[exports.MAIL_DOMAIN_KEY],
@@ -811,6 +814,7 @@ async function setFooter(footer) {
 function provider() { return gCache.provider; }
 function apiServerOrigin() { return gCache.apiServerOrigin; }
 function webServerOrigin() { return gCache.webServerOrigin; }
+function consoleServerOrigin() { return gCache.consoleServerOrigin; }
 function dashboardDomain() { return gCache.dashboardDomain; }
 function dashboardFqdn() { return gCache.dashboardFqdn; }
 function isDemo() { return gCache.isDemo; }