diff --git a/src/components/views/dialogs/NeedToRegisterDialog.js b/src/components/views/dialogs/NeedToRegisterDialog.js
deleted file mode 100644
index 8b5980164d..0000000000
--- a/src/components/views/dialogs/NeedToRegisterDialog.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * Usage:
- * Modal.createDialog(NeedToRegisterDialog, {
- *   title: "some text", (default: "Registration required")
- *   description: "some more text",
- *   onFinished: someFunction,
- * });
- */
-
-import React from 'react';
-import dis from '../../../dispatcher';
-import sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-
-module.exports = React.createClass({
-    displayName: 'NeedToRegisterDialog',
-    propTypes: {
-        title: React.PropTypes.string,
-        description: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
-        ]),
-        onFinished: React.PropTypes.func.isRequired,
-    },
-
-    onRegisterClicked: function() {
-        dis.dispatch({
-            action: "start_upgrade_registration",
-        });
-        if (this.props.onFinished) {
-            this.props.onFinished();
-        }
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        return (
-            <BaseDialog className="mx_NeedToRegisterDialog"
-                onFinished={this.props.onFinished}
-                title={this.props.title || _t('Registration required')}
-            >
-                <div className="mx_Dialog_content">
-                    {this.props.description || _t('A registered account is required for this action')}
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={true}>
-                        {_t("Cancel")}
-                    </button>
-                    <button onClick={this.onRegisterClicked}>
-                        {_t("Register")}
-                    </button>
-                </div>
-            </BaseDialog>
-        );
-    },
-});
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5f819fd8e2..241d62c580 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -697,7 +697,6 @@
     "%(oneUser)schanged their avatar": "%(oneUser)shat das Profilbild geändert",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
     "%(oneUser)sleft and rejoined": "%(oneUser)shat den Raum verlassen und wieder neu betreten",
-    "A registered account is required for this action": "Für diese Aktion ist ein registrierter Account notwendig",
     "Access Token:": "Zugangs-Token:",
     "Always show message timestamps": "Nachrichten-Zeitstempel immer anzeigen",
     "Authentication": "Authentifizierung",
@@ -711,7 +710,6 @@
     "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
     "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
-    "Registration required": "Registrierung erforderlich",
     "Report it": "Melde ihn",
     "riot-web version:": "Version von riot-web:",
     "Scroll to bottom of page": "Zum Ende der Seite springen",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index a38dddb35b..e9d78ac2f7 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -167,7 +167,6 @@
     "zu": "Ζουλού",
     "id": "Ινδονησιακά",
     "lv": "Λετονικά",
-    "A registered account is required for this action": "Ένας εγγεγραμμένος λογαριασμός απαιτείται για αυτή την ενέργεια",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ένα μήνυμα στάλθηκε στο +%(msisdn)s. Παρακαλώ γράψε τον κωδικό επαλήθευσης που περιέχει",
     "Access Token:": "Κωδικός Πρόσβασης:",
     "Always show message timestamps": "Δείχνε πάντα ένδειξη ώρας στα μηνύματα",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 97e51c9613..5d960f3a01 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -119,7 +119,6 @@
   "zh-sg":"Chinese (Singapore)",
   "zh-tw":"Chinese (Taiwan)",
   "zu":"Zulu",
-  "A registered account is required for this action": "A registered account is required for this action",
   "a room": "a room",
   "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
   "Accept": "Accept",
@@ -452,7 +451,6 @@
   "Revoke Moderator": "Revoke Moderator",
   "Refer a friend to Riot:": "Refer a friend to Riot:",
   "Register": "Register",
-  "Registration required": "Registration required",
   "rejected": "rejected",
   "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
   "Reject invitation": "Reject invitation",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 717825b789..87afe98cfd 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -119,7 +119,6 @@
     "zh-sg": "Chinese (Singapore)",
     "zh-tw": "Chinese (Taiwan)",
     "zu": "Zulu",
-    "A registered account is required for this action": "A registered account is required for this action",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
     "accept": "accept",
     "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
@@ -418,7 +417,6 @@
     "Revoke Moderator": "Revoke Moderator",
     "Refer a friend to Riot:": "Refer a friend to Riot:",
     "Register": "Register",
-    "Registration required": "Registration required",
     "rejected": "rejected",
     "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
     "Reject invitation": "Reject invitation",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 125a929b9f..86619b770c 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -119,7 +119,6 @@
     "zh-sg": "Chino (Singapur)",
     "zh-tw": "Chino (Taiwanés)",
     "zu": "Zulú",
-    "A registered account is required for this action": "Una cuenta registrada es necesaria para esta acción",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un mensaje de texto ha sido enviado a +%(msisdn)s. Por favor ingrese el código de verificación que lo contiene",
     "accept": "Aceptar",
     "%(targetName)s accepted an invitation.": "%(targetName)s ha aceptado una invitación.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 712ccb2a63..77d601b7f0 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -272,7 +272,6 @@
     "Failed to set display name": "Échec lors de l'enregistrement du nom d'affichage",
     "Failed to set up conference call": "Échec lors de l’établissement de l’appel",
     "Failed to toggle moderator status": "Échec lors de l’établissement du statut de modérateur",
-    "A registered account is required for this action": "Il est nécessaire d’avoir un compte enregistré pour effectuer cette action",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
     "Always show message timestamps": "Toujours afficher l'heure des messages",
@@ -405,7 +404,6 @@
     "Reason": "Raison",
     "Revoke Moderator": "Révoquer le Modérateur",
     "Refer a friend to Riot:": "Recommander Riot à un ami :",
-    "Registration required": "Inscription requise",
     "rejected": "rejeté",
     "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
     "Reject invitation": "Rejeter l'invitation",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 226706c884..074e7e9fd4 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -120,7 +120,6 @@
     "zh-sg": "Chinees (Singapore)",
     "zh-tw": "Chinees (Taiwan)",
     "zu": "Zulu",
-    "A registered account is required for this action": "Voor deze actie is een geregistreerd account nodig",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Voer alsjeblieft de verificatiecode in die is verstuurd naar +%(msisdn)s",
     "accept": "accepteer",
     "%(targetName)s accepted an invitation.": "%(targetName)s heeft een uitnodiging geaccepteerd.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 850e95f61f..2197f5b71a 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -700,7 +700,6 @@
     "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)salterou sua imagem pública %(repeats)s vezes",
     "%(severalUsers)schanged their avatar": "%(severalUsers)salteraram sua imagem pública",
     "Ban": "Banir",
-    "A registered account is required for this action": "Uma conta registrada é necessária para esta ação",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
@@ -716,7 +715,6 @@
     "Mute": "Silenciar",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
-    "Registration required": "Registro obrigatório",
     "Remove %(threePid)s?": "Remover %(threePid)s?",
     "Report it": "Reportar",
     "riot-web version:": "versão do riot-web:",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 75d7a115b2..635752f811 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -700,7 +700,6 @@
     "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)salterou sua imagem pública %(repeats)s vezes",
     "%(severalUsers)schanged their avatar": "%(severalUsers)salteraram sua imagem pública",
     "Ban": "Banir",
-    "A registered account is required for this action": "Uma conta registrada é necessária para esta ação",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
@@ -716,7 +715,6 @@
     "Mute": "Mudo",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
-    "Registration required": "Registro obrigatório",
     "Remove %(threePid)s?": "Remover %(threePid)s?",
     "Report it": "Reportar",
     "riot-web version:": "versão do riot-web:",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ea6487b16e..c77ad2d477 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -473,7 +473,6 @@
     "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
     "Failed to join room": "Не удалось присоединиться к комнате",
     "Failed to join the room": "Не удалось войти в комнату",
-    "A registered account is required for this action": "Необходима зарегистрированная учетная запись для этого действия",
     "Access Token:": "Токен:",
     "Always show message timestamps": "Всегда показывать время сообщения",
     "Authentication": "Авторизация",
@@ -531,7 +530,6 @@
     "Press": "Нажать",
     "Profile": "Профиль",
     "Reason": "Причина",
-    "Registration required": "Требуется регистрация",
     "rejected": "отклонено",
     "%(targetName)s rejected the invitation.": "%(targetName)s отклонил приглашение.",
     "Reject invitation": "Отклонить приглашение",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index af5e27acc2..789d5adbca 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -119,7 +119,6 @@
     "zh-sg": "Kinesiska (Singapore)",
     "zh-tw": "Kinesiska (Taiwan)",
     "zu": "Zulu",
-    "A registered account is required for this action": "Ett registrerat konto behövs för den här handlingen",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ett SMS har skickats till +%(msisdn)s. Vänligen ange verifieringskoden ur meddelandet",
     "accept": "acceptera",
     "%(targetName)s accepted an invitation.": "%(targetName)s accepterade en inbjudan.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index a54f7fee42..940f79b72b 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -262,7 +262,6 @@
     "Privileged Users": "ผู้ใช้ที่มีสิทธิพิเศษ",
     "Revoke Moderator": "เพิกถอนผู้ช่วยดูแล",
     "Refer a friend to Riot:": "แนะนำเพื่อนให้รู้จัก Riot:",
-    "Registration required": "ต้องลงทะเบียนก่อน",
     "rejected": "ปฏิเสธแล้ว",
     "%(targetName)s rejected the invitation.": "%(targetName)s ปฏิเสธคำเชิญแล้ว",
     "Reject invitation": "ปฏิเสธคำเชิญ",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c3b5c23191..a1c156b796 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -340,7 +340,6 @@
     "device id: ": "裝置 id:",
     "Reason": "原因",
     "Register": "注冊",
-    "Registration required": "要求註冊",
     "rejected": "拒絕",
     "Default server": "默認的伺服器",
     "Custom server": "自定的伺服器",