diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.module b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.module
index 64f3c526..43011082 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.module
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.module
@@ -205,6 +205,7 @@ class InputfieldPassword extends InputfieldText {
 		$newPassLabel = $this->_('New password');
 		$confirmLabel = $this->_('Confirm');
 		$name = $this->attr('name');
+		$id = $this->attr('id'); 
 		$size = $this->attr('size');
 		$out = '';
 		
@@ -219,7 +220,7 @@ class InputfieldPassword extends InputfieldText {
 		
 		$out .=
 			"<p class='InputfieldPasswordRow'>" .
-				"<label for='$this->id'>$newPassLabel</label>" . 
+				"<label for='$id'>$newPassLabel</label>" . 
 				"<input placeholder='$newPassLabel' " . $this->getAttributesString() . " /> " . 
 				"<span class='detail pass-scores' data-requirements='" . implode(' ', array_keys($requirements)) . "'>" .
 					//"<span class='on'>$angleIcon$newPassLabel</span>" . 
@@ -235,9 +236,9 @@ class InputfieldPassword extends InputfieldText {
 				"</span>" . 
 			"</p>" . 
 			"<p class='InputfieldPasswordRow'>" .
-				"<label for='_$name'>$confirmLabel</label>" . 
+				"<label for='_$id'>$confirmLabel</label>" . 
 				"<input placeholder='$confirmLabel' class='InputfieldPasswordConfirm $inputClass' type='password' " . 
-					"size='$size' id='_$name' name='_$name' value='$confirmValue' autocomplete='new-password' /> " . 
+					"size='$size' id='_$id' name='_$name' value='$confirmValue' autocomplete='new-password' /> " . 
 				"<span class='pass-confirm detail'>" . 
 					//"<span class='confirm-pending on'>$angleIcon$newPassLabel ($confirmLabel)</span>" . 
 					"<span class='confirm-yes'>$goodIcon" . $this->_('Matches') . "</span>" .