diff --git a/res/home.html b/res/home.html
index 3072fcacb..3ba2e9641 100644
--- a/res/home.html
+++ b/res/home.html
@@ -122,7 +122,7 @@
         <a href="https://riot.im"><img src="home/images/logo.svg" class="mx_HomePage_logo"></a>
         <div>
             <h1>_t("Welcome to Riot.im")</h1>
-            <h2>_t("Decentralised, encrypted chat &amp; collaboration powered by") <a href="https://matrix.org"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a></h2>
+            <h2>_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h2>
         </div>
     </div>
     <div class="mx_HomePage_col mx_HomePage_toprow">
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 6e2bd51f2..a9f2bbd0b 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -48,7 +48,8 @@ module.exports = React.createClass({
     translate: function(s) {
         s = sanitizeHtml(_t(s));
         // ugly fix for https://github.com/vector-im/riot-web/issues/4243
-        s = s.replace(/Riot\.im/, '<a href="https://riot.im">Riot.im</a>');
+        s = s.replace(/Riot\.im/, '<a href="https://riot.im target="_blank">Riot.im</a>');
+        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a>');
         return s;
     },
 
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d1c33a822..b9578e828 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -171,7 +171,7 @@
     "OK": "OK",
     "Login": "Anmeldung",
     "Welcome to Riot.im": "Willkommen bei Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von [matrix]",
     "Search the room directory": "Durchsuche Raum-Verzeichnis",
     "Chat with Riot Bot": "Chatte mit dem Riot-Bot",
     "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index afc8cc687..c6f461e0e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -163,7 +163,7 @@
   "Welcome page": "Welcome page",
   "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
   "Welcome to Riot.im": "Welcome to Riot.im",
-  "Decentralised, encrypted chat &amp; collaboration powered by": "Decentralised, encrypted chat &amp; collaboration powered by",
+  "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
   "Search the room directory": "Search the room directory",
   "Chat with Riot Bot": "Chat with Riot Bot",
   "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1fa04d956..8075a28ec 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -170,7 +170,7 @@
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!",
     "Login": "Войти",
     "Welcome to Riot.im": "Добро пожаловать на Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by": "Децентрализованное, шифрованное общение и сотрудничество на основе",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
     "Search the room directory": "Поиск по директории комнат",
     "Chat with Riot Bot": "Пообщаться с Riot Bot"
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index f2f6d17c7..66df9f4b4 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -195,5 +195,5 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ",
     "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix",
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
-    "Decentralised, encrypted chat &amp; collaboration powered by": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]"
 }