diff --git a/module/user/js/edit.js b/module/user/js/edit.js
index 632d724523..b72e4a6d2a 100644
--- a/module/user/js/edit.js
+++ b/module/user/js/edit.js
@@ -6,18 +6,21 @@ $(function()
     $('#password2').change(function(){password2Encrypted = false});
     $('#submit').click(function()
     {
-        var password1 = $('#password1').val();
-        var password2 = $('#password2').val();
-        var passwordStrength = computePasswordStrength(password1);
+        if(!password1Encrypted && !password2Encrypted)
+        {
+            var password1 = $('#password1').val();
+            var password2 = $('#password2').val();
+            var passwordStrength = computePasswordStrength(password1);
 
-        if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
-        $("form input[name=passwordStrength]").val(passwordStrength);
+            if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
+            $("form input[name=passwordStrength]").val(passwordStrength);
 
-        var rand      = $('input#verifyRand').val();
-        if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
-        if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
-        password1Encrypted = true;
-        password2Encrypted = true;
+            var rand      = $('input#verifyRand').val();
+            if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
+            if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
+            password1Encrypted = true;
+            password2Encrypted = true;
+        }
     })
 
     $("input[name='new[]']").change(function()