hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.

2 files changed, 1 insertions, 7 deletions

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

index 826a533873..53756be9ea 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -68,12 +68,6 @@ angular.module('LoginController', ['matrixService'])
     };
 
     $scope.login = function() {
-        if ($scope.account.user_id.indexOf("@") !== 0) {
-            // technically should be the host of account.homeserver
-            $scope.account.user_id = "@" + $scope.account.user_id + ":" + 
-                                     $location.host()
-        }
-    
         matrixService.setConfig({
             homeserver: $scope.account.homeserver,
             user_id: $scope.account.user_id
diff --git a/webclient/login/login.html b/webclient/login/login.html

index f02dde89a6..0fbeeabed7 100644
--- a/webclient/login/login.html
+++ b/webclient/login/login.html
@@ -15,7 +15,7 @@
         <!-- New user registration -->
         <div>
             <br/>
-            <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2">Register</button>
+            <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2 || account.pwd1 !== account.pwd2">Register</button>
         </div>
     </form>