diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index e376c6dbb..0da16d93b 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -186,7 +186,7 @@ class ConfirmedPasswordField extends FormField {
 			if($value['_Password'] || (!$value['_Password'] && !$this->canBeEmpty)) {
 				$this->value = $value['_Password'];
 			}
-			if(isset($value['_PasswordFieldVisible'])){
+			if($this->showOnClick && isset($value['_PasswordFieldVisible'])){
 				$this->children->fieldByName($this->Name() . '[_PasswordFieldVisible]')->setValue($value['_PasswordFieldVisible']);
 			}
 		} else {