diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx
index b42c3f7fd..7bcd4774d 100644
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -97,8 +97,8 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
 
             <div className="mx_HomePage_row mx_Center mx_Spacer">
                 <p className="mx_Spacer">
-                    <a href="https://riot.im" target="_blank" className="mx_FooterLink">
-                        { _t("Go to Riot.im") }
+                    <a href="https://element.io" target="_blank" className="mx_FooterLink">
+                        { _t("Go to element.io") }
                     </a>
                 </p>
             </div>
diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx
index 3f0cca2db..acde7ac0a 100644
--- a/src/async-components/structures/ErrorView.tsx
+++ b/src/async-components/structures/ErrorView.tsx
@@ -48,8 +48,8 @@ const ErrorView: React.FC<IProps> = ({title, messages}) => {
             </div>
             <div className="mx_HomePage_row mx_Center mx_Spacer">
                 <p className="mx_Spacer">
-                    <a href="https://riot.im" target="_blank" className="mx_FooterLink">
-                        { _t("Go to Riot.im") }
+                    <a href="https://element.io" target="_blank" className="mx_FooterLink">
+                        { _t("Go to element.io") }
                     </a>
                 </p>
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5dd43a4b1..117892ec7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -27,7 +27,7 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.",
     "I understand the risks and wish to continue": "I understand the risks and wish to continue",
-    "Go to Riot.im": "Go to Riot.im",
+    "Go to element.io": "Go to element.io",
     "Failed to start": "Failed to start",
     "Welcome to Element": "Welcome to Element",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index 5dcee9a7a..445a37ba5 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -86,11 +86,11 @@ function onNewScreen(screen: string) {
 //
 // If we're in electron, we should never pass through a file:// URL otherwise
 // the identity server will try to 302 the browser to it, which breaks horribly.
-// so in that instance, hardcode to use riot.im/app for now instead.
+// so in that instance, hardcode to use app.element.io for now instead.
 function makeRegistrationUrl(params: object) {
     let url;
     if (window.location.protocol === "vector:") {
-        url = 'https://riot.im/app/#/register';
+        url = 'https://app.element.io/#/register';
     } else {
         url = (
             window.location.protocol + '//' +
diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js
index 105aba1fa..f174d777b 100644
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -93,7 +93,7 @@ async function initPage() {
 
     if (hsUrl !== 'https://matrix.org/') {
         document.getElementById('configure_riot_button').href =
-            "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) +
+            "https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) +
             "&is_url=" + encodeURIComponent(isUrl);
         document.getElementById('step1_heading').innerHTML= '1: Install the app';
         document.getElementById('step2_container').style.display = 'block';
diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html
index 69287949e..7caee2048 100644
--- a/src/vector/static/incompatible-browser.html
+++ b/src/vector/static/incompatible-browser.html
@@ -482,8 +482,8 @@
     </div>
     <div class="mx_HomePage_row mx_Center mx_Spacer">
         <p class="mx_Spacer">
-            <a href="https://riot.im" target="_blank" class="mx_FooterLink">
-                Go to Riot.im
+            <a href="https://element.io" target="_blank" class="mx_FooterLink">
+                Go to element.io
             </a>
         </p>
     </div>
diff --git a/src/vector/static/unable-to-load.html b/src/vector/static/unable-to-load.html
index c91e51a8e..c1eb0f9f4 100644
--- a/src/vector/static/unable-to-load.html
+++ b/src/vector/static/unable-to-load.html
@@ -189,8 +189,8 @@
     </div>
     <div class="mx_HomePage_row mx_Center mx_Spacer">
         <p class="mx_Spacer">
-            <a href="https://riot.im" target="_blank" class="mx_FooterLink">
-                Go to Riot.im
+            <a href="https://element.io" target="_blank" class="mx_FooterLink">
+                Go to element.io
             </a>
         </p>
     </div>