diff --git a/src/Controls/PasswordRevealInput.php b/src/Controls/PasswordRevealInput.php
index 9d01666..3714ff8 100644
--- a/src/Controls/PasswordRevealInput.php
+++ b/src/Controls/PasswordRevealInput.php
@@ -25,6 +25,7 @@ public function __construct($label = null, ?int $maxLength = null)
 	public function getControl(): Html
 	{
 		$input = parent::getControl();
+		$input->value = $this->getRenderedValue();
 
 		$button = Html::el('button')
 			->setAttribute('type', 'button')
diff --git a/src/FormMacros.php b/src/FormMacros.php
index a72e380..e09d165 100644
--- a/src/FormMacros.php
+++ b/src/FormMacros.php
@@ -26,7 +26,7 @@ public static function install(Latte\Compiler $compiler): void
 		
 		$me->addMacro('formPair', fn(MacroNode $node, PhpWriter $writer) => $writer->write(
 			'$formOrContainer = end($this->global->formsStack);'
-			. '$formRenderer = $formOrContainer->getForm()->renderer;'
+			. '$formRenderer = $formOrContainer->getForm()->getRenderer();'
 			. '$__formPair = is_object(%node.word) ? %node.word : $formOrContainer[%node.word];'
 			. '$attrs = %node.array;'
 			. '$originalWrapper = $formRenderer->wrappers["pair"]["container"];'
diff --git a/src/LatteExtension.php b/src/LatteExtension.php
index 4393b9f..a7f3f27 100644
--- a/src/LatteExtension.php
+++ b/src/LatteExtension.php
@@ -25,7 +25,7 @@ public function createFormPair(Latte\Compiler\Tag $tag): Latte\Compiler\Node
 		return new Latte\Compiler\Nodes\AuxiliaryNode(
 			fn(Latte\Compiler\PrintContext $context) => $context->format(
 				'$formOrContainer = end($this->global->formsStack);'
-				. '$formRenderer = $formOrContainer->getForm()->renderer;'
+				. '$formRenderer = $formOrContainer->getForm()->getRenderer();'
 				. '$__subject = %node;'
 				. '$__formPair = is_object($__subject) ? $__subject : $formOrContainer[$__subject];'
 				. '$attrs = %node;'