diff --git a/skins/base/views/templates/Login.js b/skins/base/views/templates/Login.js
index f882397b..a783296d 100644
--- a/skins/base/views/templates/Login.js
+++ b/skins/base/views/templates/Login.js
@@ -30,7 +30,7 @@ var ServerConfig = ComponentBroker.get("molecules/ServerConfig");
 
 module.exports = React.createClass({
     DEFAULT_HS_URL: 'https://matrix.org',
-    DEFAULT_IS_URL: 'https://matrix.org',
+    DEFAULT_IS_URL: 'https://vector.im',
 
     displayName: 'Login',
     mixins: [LoginController],
diff --git a/skins/base/views/templates/Register.js b/skins/base/views/templates/Register.js
index 8dbae47d..4bfb8727 100644
--- a/skins/base/views/templates/Register.js
+++ b/skins/base/views/templates/Register.js
@@ -28,7 +28,7 @@ var ServerConfig = ComponentBroker.get("molecules/ServerConfig");
 
 module.exports = React.createClass({
     DEFAULT_HS_URL: 'https://matrix.org',
-    DEFAULT_IS_URL: 'https://matrix.org',
+    DEFAULT_IS_URL: 'https://vector.im',
 
     displayName: 'Register',
     mixins: [RegisterController],
diff --git a/src/controllers/molecules/ServerConfig.js b/src/controllers/molecules/ServerConfig.js
index b962c757..3f5dd99b 100644
--- a/src/controllers/molecules/ServerConfig.js
+++ b/src/controllers/molecules/ServerConfig.js
@@ -31,7 +31,7 @@ module.exports = {
             onHsUrlChanged: function() {},
             onIsUrlChanged: function() {},
             defaultHsUrl: 'https://matrix.org/',
-            defaultIsUrl: 'https://vector.im/'
+            defaultIsUrl: 'https://matrix.org/'
         };
     },