diff --git a/module/user/js/create.ui.js b/module/user/js/create.ui.js
index 7a5e6dbbed..f49cef2b4b 100644
--- a/module/user/js/create.ui.js
+++ b/module/user/js/create.ui.js
@@ -82,8 +82,7 @@ function clickSubmit()
             $("#passwordLength").val(password1.length);
         }
 
-        if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
-        $("form input[name=passwordStrength]").val(passwordStrength);
+        $('#passwordLength').after("<input type='hidden' name='passwordStrength' value='" + passwordStrength + "' />");
 
         const rand = $('input#verifyRand').val();
         if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
diff --git a/module/user/ui/create.html.php b/module/user/ui/create.html.php
index b58789026e..0613bb55f1 100644
--- a/module/user/ui/create.html.php
+++ b/module/user/ui/create.html.php
@@ -112,6 +112,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->user->password),
+            set::required(true),
             inputGroup
             (
                 input
@@ -256,6 +257,13 @@ formPanel
         set::class('hidden'),
         set::name('verifyRand'),
         set::value($rand)
+    ),
+    input
+    (
+        set::class('hidden'),
+        set::id('passwordLength'),
+        set::name('passwordLength'),
+        set::value($rand)
     )
 );