diff --git a/src/components/views/login/VectorCustomServerDialog.js b/src/components/views/login/VectorCustomServerDialog.js
new file mode 100644
index 00000000..b40675b7
--- /dev/null
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -0,0 +1,52 @@
+/*
+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");
+
+module.exports = React.createClass({
+    displayName: 'VectorCustomServerDialog',
+
+    render: function() {
+        console.log("State: %s", JSON.stringify(this.state));
+        console.log("Props: %s", JSON.stringify(this.props));
+        return (
+            <div className="mx_ErrorDialog">
+                <div className="mx_ErrorDialogTitle">
+                    Custom Server Options
+                </div>
+                <div className="mx_Dialog_content">
+                    <span>
+                        You can use the custom server options to log into other Matrix
+                        servers by specifying a different Home server URL.
+                        <br/>
+                        This allows you to use Vector with an existing Matrix account on
+                        a different Home server.
+                        <br/>
+                        <br/>
+                        You can also set a custom Identity server but this will affect
+                        people&#39;s ability to find you if you use a server in a group other
+                        than the main Matrix.org group.
+                    </span>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.props.onFinished} autoFocus={true}>
+                        Dismiss
+                    </button>
+                </div>
+            </div>
+        );
+    }
+});
diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index f847bb39..1b6f1b70 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -24,6 +24,10 @@ limitations under the License.
 var skin = {};
 
 // Vector-specific stuff
+skin['login.LoginFooter'] = require('../../components/views/login/VectorLoginFooter');
+skin['login.LoginHeader'] = require('../../components/views/login/VectorLoginHeader');
+skin['login.CustomServerDialog'] = require("../../components/views/login/VectorCustomServerDialog");
+
 skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
 skin['elements.ImageView'] = require('../../components/views/elements/ImageView');
 skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
@@ -36,8 +40,6 @@ skin['rooms.RoomDropTarget'] = require('../../components/views/rooms/RoomDropTar
 skin['rooms.RoomTooltip'] = require('../../components/views/rooms/RoomTooltip');
 skin['rooms.SearchBar'] = require('../../components/views/rooms/SearchBar');
 skin['globals.MatrixToolbar'] = require('../../components/views/globals/MatrixToolbar');
-skin['login.LoginFooter'] = require('../../components/views/login/VectorLoginFooter');
-skin['login.LoginHeader'] = require('../../components/views/login/VectorLoginHeader');
 skin['structures.BottomLeftMenu'] = require('../../components/structures/BottomLeftMenu');
 skin['structures.LeftPanel'] = require('../../components/structures/LeftPanel');
 skin['structures.RightPanel'] = require('../../components/structures/RightPanel');