diff --git a/cmd/server/assets/login/change-password.html b/cmd/server/assets/login/change-password.html
index 94860ad71..61b0a030b 100644
--- a/cmd/server/assets/login/change-password.html
+++ b/cmd/server/assets/login/change-password.html
@@ -69,10 +69,10 @@
           $submit.prop('disabled', false);
         });
 
-      $password.keyup(function() {
+      $password.on("change keyup paste", function() {
         $submit.prop('disabled', !checkPasswordValid($password.val()));
       });
-      $retype.keyup(function() {
+      $retype.on("change keyup paste", function() {
         $submit.prop('disabled', !checkPasswordValid($password.val()));
       });
 
diff --git a/cmd/server/assets/login/select-password.html b/cmd/server/assets/login/select-password.html
index b2c195882..ab5bf34d1 100644
--- a/cmd/server/assets/login/select-password.html
+++ b/cmd/server/assets/login/select-password.html
@@ -66,10 +66,10 @@
       let $password = $('#password');
       let $retype = $('#retype');
 
-      $password.keyup(function() {
+      $password.on("change keyup paste", function() {
         $submit.prop('disabled', !checkPasswordValid($password.val()));
       });
-      $retype.keyup(function() {
+      $retype.on("change keyup paste", function() {
         $submit.prop('disabled', !checkPasswordValid($password.val()));
       });