diff --git a/src/Registration.js b/src/Registration.js
index a6e7127010..c301f36ae1 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -73,9 +73,12 @@ export async function startAnyRegistrationFlow(options) {
             description: _t("You need to login or register to do this."),
             button: _t("Register"),
             extraButtons: [
-                <button className="mx_Dialog_primary"
-                onClick={() => {modal.close(); dis.dispatch({action: 'start_login',
-                                                             screenAfterLogin: options.screen_after});}}>
+                <button className="mx_Dialog_primary" key="start_login"
+                onClick={() => {
+                    modal.close(); dis.dispatch({action: 'start_login',
+                                                 screenAfterLogin: options.screen_after});
+                               }
+                        }>
                     { _t('Login') }
                 </button>,
             ],
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3175f5b7b8..a9bb8e3a7d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1010,9 +1010,9 @@ export default createReactClass({
                 go_welcome_on_cancel: true,
                 screen_after: {screen: `user/${this.props.config.welcomeUserId}`,
                                params: {
-                                   action: 'chat'
-                               }
-                              }
+                                   action: 'chat',
+                               },
+                              },
             });
             return;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 79b045dd34..8692d38788 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -123,9 +123,10 @@
     "Unable to enable Notifications": "Unable to enable Notifications",
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
-    "Registration Required": "Registration Required",
-    "You need to register to do this. Would you like to register now?": "You need to register to do this. Would you like to register now?",
+    "Login or Registration Required": "Login or Registration Required",
+    "You need to login or register to do this.": "You need to login or register to do this.",
     "Register": "Register",
+    "Login": "Login",
     "Default": "Default",
     "Restricted": "Restricted",
     "Moderator": "Moderator",