diff --git a/src/components/login/Login.js b/src/components/login/Login.js
index f9434092d7..414528f1be 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");
 
 /**
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 9c8872e01f..51de92a7b3 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -23,10 +23,12 @@ 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 Login = require("../../../../components/login/Login");
 var Registration = require("../../../../components/login/Registration");
 var Signup = require("matrix-react-sdk/lib/Signup");
+var config = require("../../../../../config.json");
 
 module.exports = React.createClass({
     displayName: 'MatrixChat',
@@ -178,12 +180,16 @@ module.exports = React.createClass({
                     onLoggedIn={this.onLoggedIn}
                     onLoginClick={this.onLoginClick}
                     registerLogic={new Signup.Register(
-                        "foo", "bar"
+                        config.default_hs_url, config.default_is_url
                     )} />
             );
         } else {
             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} />
             );
         }
     }