From c57fb44c71686a13217a1ae0f6019b0aede9ca9b Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 17 Nov 2015 13:26:23 +0000
Subject: [PATCH 1/2] Fix path resolution

---
 src/components/login/Login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/login/Login.js b/src/components/login/Login.js
index f9434092d..414528f1b 100644
--- a/src/components/login/Login.js
+++ b/src/components/login/Login.js
@@ -20,8 +20,8 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var sdk = require('matrix-react-sdk');
 var Signup = require("matrix-react-sdk/lib/Signup");
-var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin");
-var CasLogin = require("matrix-react-sdk/lib/components/CasLogin");
+var PasswordLogin = require("matrix-react-sdk/lib/components/login/PasswordLogin");
+var CasLogin = require("matrix-react-sdk/lib/components/login/CasLogin");
 var ServerConfig = require("./ServerConfig");
 
 /**

From 714c96283e21f19f1d071f4e695b44651ae1c669 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 17 Nov 2015 15:12:55 +0000
Subject: [PATCH 2/2] Setting defaults from config.json got lost

---
 src/skins/vector/views/pages/MatrixChat.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 5ed96c376..e4e031d81 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -24,6 +24,7 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var Matrix = require("matrix-js-sdk");
 var ContextualMenu = require("../../../../ContextualMenu");
+var config = require("../../../../../config.json");
 
 module.exports = React.createClass({
     displayName: 'MatrixChat',
@@ -169,7 +170,11 @@ module.exports = React.createClass({
         } else {
             var Login = require("../../../../components/login/Login");
             return (
-                <Login onLoggedIn={this.onLoggedIn} onRegisterClick={this.onRegisterClick} />
+                <Login
+                    onLoggedIn={this.onLoggedIn}
+                    onRegisterClick={this.onRegisterClick}
+                    homeserverUrl={config.default_hs_url}
+                    identityServerUrl={config.default_is_url} />
             );
         }
     }