diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index a2df3da047..9887e025bc 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -1,7 +1,6 @@
 {
     "update_base_url": "https://packages.riot.im/desktop/update/",
-    "default_hs_url": "https://matrix.org",
-    "default_is_url": "https://vector.im",
+    "default_server_name": "matrix.org",
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
diff --git a/package.json b/package.json
index 40538deac1..bd05b090df 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "electron": "yarn install:electron && electron .",
     "start:res": "node scripts/copy-res.js -w",
     "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
-    "start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
+    "start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress --mode production",
     "start:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:watch",
     "start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/yarn-sub.js matrix-js-sdk start:watch",
     "start:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk start:all",
@@ -77,7 +77,7 @@
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.6.0",
-    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
diff --git a/riot.im/app/config.json b/riot.im/app/config.json
index 164b81c1ae..70ecddfdac 100644
--- a/riot.im/app/config.json
+++ b/riot.im/app/config.json
@@ -1,6 +1,5 @@
 {
-    "default_hs_url": "https://matrix.org",
-    "default_is_url": "https://vector.im",
+    "default_server_name": "matrix.org",
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index a1f0b35b75..f028ab970e 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -1,6 +1,5 @@
 {
-    "default_hs_url": "https://matrix.org",
-    "default_is_url": "https://vector.im",
+    "default_server_name": "matrix.org",
     "brand": "Riot",
     "integrations_ui_url": "https://scalar-staging.vector.im/",
     "integrations_rest_url": "https://scalar-staging.vector.im/api",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2c9b40183f..1f404351fd 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -38,7 +38,7 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Riot konfiguration indeholder ugyldig JSON. Venligst korrigér problemet og opdatér siden.",
     "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s",
     "Invalid JSON": "Ugyldig JSON",
-    "Your Riot is misconfigured": "Din Riot er fejlkonfigureret",
+    "Your Riot is misconfigured": "Din Riot er konfigureret forkert",
     "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.",
     "Invalid configuration: no default server specified.": "Ugyldig konfiguration: ingen standardserver angivet.",
diff --git a/yarn.lock b/yarn.lock
index d89fd004ba..b1eb8246f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6679,9 +6679,9 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-"olm@https://packages.matrix.org/npm/olm/olm-3.1.0.tgz":
-  version "3.1.0"
-  resolved "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz#2c8fc2a42b7ea12febc31baa73ec03d9b601da16"
+"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz":
+  version "3.1.4"
+  resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3"
 
 on-finished@~2.3.0:
   version "2.3.0"