diff --git a/config.sample.json b/config.sample.json
index e86b52ed25..6f662d0831 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -34,12 +34,6 @@
             "matrix.org"
         ]
     },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "whitelisted_hs_urls": ["https://matrix.org"],
-        "whitelisted_is_urls": ["https://vector.im", "https://matrix.org"],
-        "siteId": 1
-    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
diff --git a/docs/config.md b/docs/config.md
index ee0d54763f..6bcb1b6f93 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -206,7 +206,7 @@ Together, the options might look like this in your config:
       "auth_header_logo_url": "https://example.org/assets/logo.svg",
       "auth_footer_links": [
          {"text": "FAQ", "url": "https://example.org/faq"},
-         {"text": "Donate", "url": "https://example.org/donate"},
+         {"text": "Donate", "url": "https://example.org/donate"}
       ]
    },
    "embedded_pages": {
@@ -393,25 +393,19 @@ To add additional "terms and conditions" links throughout the app, use the follo
 
 ## Analytics
 
-Analytics are currently possible with two systems: `posthog` (preferred) and <del>`piwik`</del> (matomo; deprecated). When
-these configuration options are not present, analytics are deemed impossible and the user won't be asked to opt-in to the
-system.
-
 To configure [Posthog](https://posthog.com/), add the following under `posthog` in your config:
 
 1. `api_host`: The hostname of the posthog server.
 2. `project_api_key`: The API key from posthog.
 
-To configure Piwik (***DEPRECATED***), add the following under `piwik` in your config:
+When these configuration options are not present,
+analytics are deemed impossible and the user won't be asked to opt in to the system.
 
-1. `url`: The URL of the piwik server.
-2. `site_id`: The site ID to use.
-3. `policy_url`: URL to the analytics collection policy.
-4. `whitelisted_hs_urls`: A list of homeserver client-server URLs to *not* redact from analytics.
+There are additional root-level options which can be specified:
 
-Additionally, you may set `"piwik": false` to disable piwik configuration too. An `analytics_owner` can also be specified in your
-config to replace the company name used in dialogs talking about analytics - this defaults to `brand`, and is useful when the
-provider of analytics is different from the provider of the Element instance.
+1. `analytics_owner`: the company name used in dialogs talking about analytics - this defaults to `brand`,
+and is useful when the provider of analytics is different from the provider of the Element instance.
+2. `privacy_policy_url`: URL to the privacy policy including the analytics collection policy.
 
 ## Server hosting links
 
diff --git a/docs/kubernetes.md b/docs/kubernetes.md
index 58fd9d75a5..a49888ef93 100644
--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -70,12 +70,6 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
                         "matrix.org"
                 ]
             },
-            "piwik": {
-                "url": "https://piwik.riot.im/",
-                "whitelistedHSUrls": ["https://matrix.org"],
-                "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
-                "siteId": 1
-            },
             "enable_presence_by_hs_url": {
                 "https://matrix.org": false,
                 "https://matrix-client.matrix.org": false
diff --git a/element.io/app/config.json b/element.io/app/config.json
index a5ee01f9c7..562834f8f1 100644
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -14,11 +14,6 @@
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "showLabsSettings": false,
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://element.io/cookie-policy"
-    },
     "roomDirectory": {
         "servers": [
             "matrix.org",
@@ -54,5 +49,6 @@
         "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
         "apiHost": "https://posthog.element.io"
     },
+    "privacy_policy_url": "https://element.io/cookie-policy",
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index 6ac87c598d..8cbeddbec8 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -14,11 +14,6 @@
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "showLabsSettings": true,
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://element.io/cookie-policy"
-    },
     "roomDirectory": {
         "servers": [
             "matrix.org",
@@ -58,6 +53,7 @@
         "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
         "apiHost": "https://posthog.element.io"
     },
+    "privacy_policy_url": "https://element.io/cookie-policy",
     "features": {
         "feature_spotlight": true,
         "feature_video_rooms": true
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index 9c1bc3b9bc..831288aedd 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -339,7 +339,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     ) {
         // this will get intercepted by electron-main will-navigate
         super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId);
-        Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, {
+        Modal.createDialog(InfoDialog, {
             title: _t("Go to your browser to complete Sign In"),
             description: <Spinner />,
         });