diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index fab442951..d2689a0b4 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -134,12 +134,14 @@ class ConfirmedPasswordField extends FormField {
 			if($value['_Password'] || (!$value['_Password'] && !$this->canBeEmpty)) {
 				$this->value = $value['_Password'];
 			}
+			if(isset($value['_PasswordFieldVisible'])){
+				$this->children->fieldByName($this->Name() . '[_PasswordFieldVisible]')->setValue($value['_PasswordFieldVisible']);
+			}
 		} else {
 			if($value || (!$value && !$this->canBeEmpty)) {
 				$this->value = $value;
 			}
 		}
-		
 	}
 	
 	function jsValidation() {