Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1

1 files changed, 2 insertions, 0 deletions

diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js

index 2f1f224a94..e3d0eca946 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -70,6 +70,7 @@ angular.module('LoginController', ['matrixService'])
     $scope.login = function() {
         matrixService.setConfig({
             homeserver: $scope.account.homeserver,
+            identityServer: $scope.account.identityServer,
             user_id: $scope.account.user_id
         });
         // try to login
@@ -79,6 +80,7 @@ angular.module('LoginController', ['matrixService'])
                     $scope.feedback = "Login successful.";
                     matrixService.setConfig({
                         homeserver: $scope.account.homeserver,
+                        identityServer: $scope.account.identityServer,
                         user_id: response.data.user_id,
                         access_token: response.data.access_token
                     });