diff --git a/include/class.forms.php b/include/class.forms.php
index 0edab5b9da21784c71889b843dc1a722a77a7715..02758818d28e63519f08b5d6e4dc53e761988478 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -93,7 +93,7 @@ class Form {
         if (!$this->_clean) {
             $this->_clean = array();
             foreach ($this->getFields() as $key=>$field) {
-                if ($field->isPresentationOnly())
+                if (!$field->hasData())
                     continue;
                 $this->_clean[$key] = $this->_clean[$field->get('name')]
                     = $field->getClean();
diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php
index 1be98b962556c81b0f87ef13011d9b43e2317d72..b0a3d7d47457eaffb4bc2998a4994ae0ca557aef 100644
--- a/include/staff/templates/dynamic-form.tmpl.php
+++ b/include/staff/templates/dynamic-form.tmpl.php
@@ -89,8 +89,7 @@ if (isset($options['entry']) && $options['mode'] == 'edit') { ?>
             <?php
             }
             foreach ($field->errors() as $e) { ?>
-                <br />
-                <font class="error"><?php echo Format::htmlchars($e); ?></font>
+                <div class="error"><?php echo Format::htmlchars($e); ?></div>
             <?php } ?>
             </div></td>
         </tr>