diff --git a/core/admin/assets/content/assets/app.js b/core/admin/assets/content/assets/app.js
index 96d6deb7..81f1802a 100644
--- a/core/admin/assets/content/assets/app.js
+++ b/core/admin/assets/content/assets/app.js
@@ -129,7 +129,13 @@ $('document').ready(function() {
         $("#pw").change(function(){
             hibpCheck($("#pw").value);
             return true;
-        })
+        });
+        $("#pw").closest("form").submit(function(event){
+            if($("#pwned").value > -1) {return;};
+            event.preventDefault();
+            hibpCheck($("#pw").value)
+            event.trigger();
+        });
     }
 
 });