diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
index 477dd946..3a4f38c5 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
@@ -12,7 +12,7 @@ jQuery(document).ready(function($) {
 		var $percent = $input.siblings('.pass-percent');
 		var $scores = $wrapScores.children();
 		var requirements = $wrapScores.attr('data-requirements').split(' ');
-		var minlength = parseInt($input.attr('minlength'));
+		var minlength = parseInt($input.attr('data-minlength'));
 		var options = {
 			banMode: $input.attr('data-banMode'),
 			strengthScaleFactor: parseFloat($input.attr('data-factor'))
diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
index d82e11c0..f232a031 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(c){var a=c("input.InputfieldPasswordComplexify");a.each(function(){var j=c(this);var d=j.closest(".Inputfield");var i=d.find(".InputfieldPasswordConfirm");var h=i.next(".pass-confirm");var k=j.siblings(".pass-scores");var e=j.siblings(".pass-percent");var l=k.children();var g=k.attr("data-requirements").split(" ");var f=parseInt(j.attr("minlength"));var m={banMode:j.attr("data-banMode"),strengthScaleFactor:parseFloat(j.attr("data-factor"))};j.complexify(m,function(o,p){var u=null;var s=j.val();var v=s.length;var x=0;if(v>0){for(var r=0;r<g.length;r++){var t=false;var z=g[r];var w=d.find(".pass-require-"+z);if(z=="letter"){var y=XRegExp("\\p{L}");if(!y.test(s)){t=true}}else{if(z=="upper"){var y=XRegExp("\\p{Lu}");if(!y.test(s)){t=true}}else{if(z=="lower"){var y=XRegExp("\\p{Ll}");if(!y.test(s)){t=true}}else{if(z=="digit"){var y=XRegExp("\\p{N}");if(!y.test(s)){t=true}}else{if(z=="other"){var y=XRegExp("\\p{P}");var q=XRegExp("\\p{S}");if(!y.test(s)&&!q.test(s)){t=true}}else{if(z=="space"){var y=XRegExp("\\p{Z}");if(!y.test(s)){t=true}}else{if(z=="minlength"){if(v<f){t=true}}}}}}}}if(t){w.removeClass("pass-require-good ui-priority-secondary")}else{w.addClass("pass-require-good ui-priority-secondary");x++}}}else{d.find(".pass-require-good").removeClass("pass-require-good ui-priority-secondary")}if(v==0){l.removeClass("on");return}else{if(x<g.length){u=l.filter(".pass-fail")}else{if(v<f){u=l.filter(".pass-short")}else{if(!o){u=l.filter(".pass-common")}else{if(p==0){u=l.filter(".pass-invalid")}else{if(p<50){u=l.filter(".pass-weak")}else{if(p<70){u=l.filter(".pass-medium")}else{if(p<100){u=l.filter(".pass-good")}else{if(p==100){u=l.filter(".pass-excellent")}}}}}}}}}if(u&&!u.hasClass("on")){u.siblings(".on").removeClass("on");u.addClass("on")}if(u.hasClass("pass-fail")||u.hasClass("pass-short")||u.hasClass("pass-common")||u.hasClass("pass-invalid")){i.attr("disabled","disabled").val("").change()}else{i.removeAttr("disabled");u.find("small").remove();u.append("<small style='margin-left:0.5em'>("+Math.floor(p)+"%)</small>")}if(i.val().length){i.change()}});j.on("change",function(){var n=c(this).val();if(n.length>0){j.attr("required","required");i.attr("required","required")}else{if(!c(this).closest(".InputfieldStateRequired").length){j.removeAttr("required");i.removeAttr("required")}}});i.on("keyup change",function(){var q=j.val();var p=c(this).val();var n=null;var o=j.closest("p").removeClass("pass-matches");if(p.length==0){n=h.children(".confirm-pending")}else{if(q==p){n=h.children(".confirm-yes");o.addClass("pass-matches")}else{if(q.indexOf(p)===0){n=h.children(".confirm-qty");n.children("span").html(p.length+"/"+q.length)}else{n=h.children(".confirm-no")}}}if(n){n.addClass("on").siblings(".on").removeClass("on")}})});var b=a.filter("[autocomplete='off']");if(b.length){setTimeout(function(){b.each(function(){if(c(this).val().length<1){return}c(this).val("").trigger("keyup").change().closest(".Inputfield").removeClass("InputfieldStateChanged")})},1000)}});
\ No newline at end of file
+jQuery(document).ready(function(c){var a=c("input.InputfieldPasswordComplexify");a.each(function(){var j=c(this);var d=j.closest(".Inputfield");var i=d.find(".InputfieldPasswordConfirm");var h=i.next(".pass-confirm");var k=j.siblings(".pass-scores");var e=j.siblings(".pass-percent");var l=k.children();var g=k.attr("data-requirements").split(" ");var f=parseInt(j.attr("data-minlength"));var m={banMode:j.attr("data-banMode"),strengthScaleFactor:parseFloat(j.attr("data-factor"))};j.complexify(m,function(o,p){var u=null;var s=j.val();var v=s.length;var x=0;if(v>0){for(var r=0;r<g.length;r++){var t=false;var z=g[r];var w=d.find(".pass-require-"+z);if(z=="letter"){var y=XRegExp("\\p{L}");if(!y.test(s)){t=true}}else{if(z=="upper"){var y=XRegExp("\\p{Lu}");if(!y.test(s)){t=true}}else{if(z=="lower"){var y=XRegExp("\\p{Ll}");if(!y.test(s)){t=true}}else{if(z=="digit"){var y=XRegExp("\\p{N}");if(!y.test(s)){t=true}}else{if(z=="other"){var y=XRegExp("\\p{P}");var q=XRegExp("\\p{S}");if(!y.test(s)&&!q.test(s)){t=true}}else{if(z=="space"){var y=XRegExp("\\p{Z}");if(!y.test(s)){t=true}}else{if(z=="minlength"){if(v<f){t=true}}}}}}}}if(t){w.removeClass("pass-require-good ui-priority-secondary")}else{w.addClass("pass-require-good ui-priority-secondary");x++}}}else{d.find(".pass-require-good").removeClass("pass-require-good ui-priority-secondary")}if(v==0){l.removeClass("on");return}else{if(x<g.length){u=l.filter(".pass-fail")}else{if(v<f){u=l.filter(".pass-short")}else{if(!o){u=l.filter(".pass-common")}else{if(p==0){u=l.filter(".pass-invalid")}else{if(p<50){u=l.filter(".pass-weak")}else{if(p<70){u=l.filter(".pass-medium")}else{if(p<100){u=l.filter(".pass-good")}else{if(p==100){u=l.filter(".pass-excellent")}}}}}}}}}if(u&&!u.hasClass("on")){u.siblings(".on").removeClass("on");u.addClass("on")}if(u.hasClass("pass-fail")||u.hasClass("pass-short")||u.hasClass("pass-common")||u.hasClass("pass-invalid")){i.attr("disabled","disabled").val("").change()}else{i.removeAttr("disabled");u.find("small").remove();u.append("<small style='margin-left:0.5em'>("+Math.floor(p)+"%)</small>")}if(i.val().length){i.change()}});j.on("change",function(){var n=c(this).val();if(n.length>0){j.attr("required","required");i.attr("required","required")}else{if(!c(this).closest(".InputfieldStateRequired").length){j.removeAttr("required");i.removeAttr("required")}}});i.on("keyup change",function(){var q=j.val();var p=c(this).val();var n=null;var o=j.closest("p").removeClass("pass-matches");if(p.length==0){n=h.children(".confirm-pending")}else{if(q==p){n=h.children(".confirm-yes");o.addClass("pass-matches")}else{if(q.indexOf(p)===0){n=h.children(".confirm-qty");n.children("span").html(p.length+"/"+q.length)}else{n=h.children(".confirm-no")}}}if(n){n.addClass("on").siblings(".on").removeClass("on")}})});var b=a.filter("[autocomplete='off']");if(b.length){setTimeout(function(){b.each(function(){if(c(this).val().length<1){return}c(this).val("").trigger("keyup").change().closest(".Inputfield").removeClass("InputfieldStateChanged")})},1000)}});
\ No newline at end of file