diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index e05d3e6510..3ee4caec97 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -70,8 +70,6 @@ skin['molecules.UserSelector'] = require('./views/molecules/UserSelector');
 skin['molecules.voip.CallView'] = require('./views/molecules/voip/CallView');
 skin['molecules.voip.IncomingCallBox'] = require('./views/molecules/voip/IncomingCallBox');
 skin['molecules.voip.VideoView'] = require('./views/molecules/voip/VideoView');
-skin['organisms.CasLogin'] = require('./views/organisms/CasLogin');
-skin['organisms.PasswordLogin'] = require('./views/organisms/PasswordLogin');
 skin['organisms.CreateRoom'] = require('./views/organisms/CreateRoom');
 skin['organisms.ErrorDialog'] = require('./views/organisms/ErrorDialog');
 skin['organisms.LeftPanel'] = require('./views/organisms/LeftPanel');
diff --git a/src/skins/vector/views/organisms/CasLogin.js b/src/skins/vector/views/organisms/CasLogin.js
deleted file mode 100644
index ad9dbed955..0000000000
--- a/src/skins/vector/views/organisms/CasLogin.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2015 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.
-*/
-
-'use strict';
-
-var React = require('react');
-
-var CasLoginController = require('matrix-react-sdk/lib/controllers/organisms/CasLogin');
-
-module.exports = React.createClass({
-    displayName: 'CasLogin',
-    mixins: [CasLoginController],
-
-    render: function() {
-        return (
-            <div>
-                <button onClick={this.onCasClicked}>Sign in with CAS</button>
-            </div>
-        );
-    },
-
-});
diff --git a/src/skins/vector/views/organisms/PasswordLogin.js b/src/skins/vector/views/organisms/PasswordLogin.js
deleted file mode 100644
index fabd71d67e..0000000000
--- a/src/skins/vector/views/organisms/PasswordLogin.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright 2015 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.
-*/
-
-var React = require('react');
-var ReactDOM = require('react-dom');
-
-/**
- * A pure UI component which displays a username/password form.
- */
-module.exports = React.createClass({displayName: 'PasswordLogin',
-    propTypes: {
-        onSubmit: React.PropTypes.func.isRequired // fn(username, password)
-    },
-
-    getInitialState: function() {
-        return {
-            username: "",
-            password: ""
-        };
-    },
-
-    onSubmitForm: function(ev) {
-        ev.preventDefault();
-        this.props.onSubmit(this.state.username, this.state.password);
-    },
-
-    onUsernameChanged: function(ev) {
-        this.setState({username: ev.target.value});
-    },
-
-    onPasswordChanged: function(ev) {
-        this.setState({password: ev.target.value});
-    },
-
-    render: function() {
-        return (
-            <div>
-                <form onSubmit={this.onSubmitForm}>
-                <input className="mx_Login_field" ref="user" type="text"
-                    value={this.state.username} onChange={this.onUsernameChanged}
-                    placeholder="Email or user name" />
-                <br />
-                <input className="mx_Login_field" ref="pass" type="password"
-                    value={this.state.password} onChange={this.onPasswordChanged}
-                    placeholder="Password" />
-                <br />
-                <input className="mx_Login_submit" type="submit" value="Log in" />
-                </form>
-            </div>
-        );
-    }
-});
\ No newline at end of file
diff --git a/src/skins/vector/views/pages/LoginPage.js b/src/skins/vector/views/pages/LoginPage.js
index 00f46a37ff..bfd2d4b936 100644
--- a/src/skins/vector/views/pages/LoginPage.js
+++ b/src/skins/vector/views/pages/LoginPage.js
@@ -20,6 +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");
 
 /**
  * A wire component which glues together login UI components and Signup logic
@@ -134,12 +136,10 @@ module.exports = React.createClass({displayName: 'LoginPage',
     componentForStep: function(step) {
         switch (step) {
             case 'm.login.password':
-                var PasswordLogin = sdk.getComponent('organisms.PasswordLogin');
                 return (
                     <PasswordLogin onSubmit={this.onPasswordLogin} />
                 );
             case 'm.login.cas':
-                var CasLogin = sdk.getComponent('organisms.CasLogin');
                 return (
                     <CasLogin />
                 );