diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
index f5a00c87..19e216c4 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
@@ -168,7 +168,7 @@ jQuery(document).ready(function($) {
 	});
 
 	// accommodate issue where Firefox auto-populates remembered password when it shouldn't
-	var $ffinputs = $inputs.filter("[autocomplete='off']");
+	var $ffinputs = $('.InputfieldPassword').find("input[autocomplete='new-password']");
 	if($ffinputs.length) {
 		setTimeout(function() {
 			$ffinputs.each(function() {
diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
index 184373a1..c0e30d60 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 k=c(this);var d=k.closest(".Inputfield");var j=d.find(".InputfieldPasswordConfirm");var h=j.next(".pass-confirm");var i=d.find("input.InputfieldPasswordOld");var l=k.siblings(".pass-scores");var e=k.siblings(".pass-percent");var m=l.children();var g=l.attr("data-requirements").split(" ");var f=parseInt(k.attr("data-minlength"));var n={banMode:k.attr("data-banMode"),strengthScaleFactor:parseFloat(k.attr("data-factor")),minimumChars:f};if(i.length){k.attr("disabled","disabled");i.on("keyup",function(){if(c(this).val().length>0){i.off("keyup");k.removeAttr("disabled")}})}if(j.length){j.attr("disabled","disabled")}k.complexify(n,function(o,p){var u=null;var s=k.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){m.removeClass("on");return}else{if(i.length&&i.val()===k.val()){u=m.filter(".pass-same")}else{if(x<g.length){u=m.filter(".pass-fail")}else{if(v<f){u=m.filter(".pass-short")}else{if(!o){u=m.filter(".pass-common")}else{if(p==0){u=m.filter(".pass-invalid")}else{if(p<50){u=m.filter(".pass-weak")}else{if(p<70){u=m.filter(".pass-medium")}else{if(p<100){u=m.filter(".pass-good")}else{if(p==100){u=m.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")||u.hasClass("pass-same")){j.attr("disabled","disabled").val("").change()}else{j.removeAttr("disabled");u.find("small").remove();u.append("<small style='margin-left:0.5em'>("+Math.floor(p)+"%)</small>")}if(j.val().length){j.change()}});k.on("change",function(){var o=c(this).val();if(o.length>0){k.attr("required","required");j.attr("required","required")}else{if(!c(this).closest(".InputfieldStateRequired").length){k.removeAttr("required");j.removeAttr("required")}}});j.on("keyup change",function(){var r=k.val();var q=c(this).val();var o=null;var p=k.closest("p").removeClass("pass-matches");if(q.length==0){o=h.children(".confirm-pending")}else{if(r==q){o=h.children(".confirm-yes");p.addClass("pass-matches")}else{if(r.indexOf(q)===0){o=h.children(".confirm-qty");o.children("span").html(q.length+"/"+r.length)}else{o=h.children(".confirm-no")}}}if(o){o.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 k=c(this);var d=k.closest(".Inputfield");var j=d.find(".InputfieldPasswordConfirm");var h=j.next(".pass-confirm");var i=d.find("input.InputfieldPasswordOld");var l=k.siblings(".pass-scores");var e=k.siblings(".pass-percent");var m=l.children();var g=l.attr("data-requirements").split(" ");var f=parseInt(k.attr("data-minlength"));var n={banMode:k.attr("data-banMode"),strengthScaleFactor:parseFloat(k.attr("data-factor")),minimumChars:f};if(i.length){k.attr("disabled","disabled");i.on("keyup",function(){if(c(this).val().length>0){i.off("keyup");k.removeAttr("disabled")}})}if(j.length){j.attr("disabled","disabled")}k.complexify(n,function(o,p){var u=null;var s=k.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){m.removeClass("on");return}else{if(i.length&&i.val()===k.val()){u=m.filter(".pass-same")}else{if(x<g.length){u=m.filter(".pass-fail")}else{if(v<f){u=m.filter(".pass-short")}else{if(!o){u=m.filter(".pass-common")}else{if(p==0){u=m.filter(".pass-invalid")}else{if(p<50){u=m.filter(".pass-weak")}else{if(p<70){u=m.filter(".pass-medium")}else{if(p<100){u=m.filter(".pass-good")}else{if(p==100){u=m.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")||u.hasClass("pass-same")){j.attr("disabled","disabled").val("").change()}else{j.removeAttr("disabled");u.find("small").remove();u.append("<small style='margin-left:0.5em'>("+Math.floor(p)+"%)</small>")}if(j.val().length){j.change()}});k.on("change",function(){var o=c(this).val();if(o.length>0){k.attr("required","required");j.attr("required","required")}else{if(!c(this).closest(".InputfieldStateRequired").length){k.removeAttr("required");j.removeAttr("required")}}});j.on("keyup change",function(){var r=k.val();var q=c(this).val();var o=null;var p=k.closest("p").removeClass("pass-matches");if(q.length==0){o=h.children(".confirm-pending")}else{if(r==q){o=h.children(".confirm-yes");p.addClass("pass-matches")}else{if(r.indexOf(q)===0){o=h.children(".confirm-qty");o.children("span").html(q.length+"/"+r.length)}else{o=h.children(".confirm-no")}}}if(o){o.addClass("on").siblings(".on").removeClass("on")}})});var b=c(".InputfieldPassword").find("input[autocomplete='new-password']");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