diff --git a/lib/Horde/Form.php b/lib/Horde/Form.php
index 58c1441..04baad9 100644
--- a/lib/Horde/Form.php
+++ b/lib/Horde/Form.php
@@ -824,7 +824,10 @@ public function validate($vars = null, $canAutoFill = false)
 
         foreach ($this->getVariables() as $var) {
             $this->_autofilled = $var->_autofilled && $this->_autofilled;
-            if (!$var->validate($vars, $message)) {
+            $valid = $var instanceof Horde_Form_Variable
+                ? $var->validate($vars, $message)
+                : $var->validate($vars);
+            if (!$valid) {
                 $this->_errors[$var->getVarName()] = $var->getMessage();
             }
         }
@@ -834,7 +837,10 @@ public function validate($vars = null, $canAutoFill = false)
         }
 
         foreach ($this->_hiddenVariables as $var) {
-            if (!$var->validate($vars, $message)) {
+            $valid = $var instanceof Horde_Form_Variable
+                ? $var->validate($vars, $message)
+                : $var->validate($vars);
+            if (!$valid) {
                 $this->_errors[$var->getVarName()] = $var->getMessage();
             }
         }