diff --git a/guacamole/src/main/webapp/scripts/admin-ui.js b/guacamole/src/main/webapp/scripts/admin-ui.js
index 15f4520ae..f5e524b2f 100644
--- a/guacamole/src/main/webapp/scripts/admin-ui.js
+++ b/guacamole/src/main/webapp/scripts/admin-ui.js
@@ -516,7 +516,8 @@ GuacAdmin.reset = function() {
 
             // Update password if changed
             var password_modified = false;
-            password_field.onchange = function() {
+            password_field.onchange =
+            reenter_password_field.onchange = function() {
                 password_modified = true;
             };