diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index a52990e5ab0152859b1ed1d5651566a9b878e729..21324cbbd5826e171ba32e4d5b7be31b746275c9 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -537,7 +537,7 @@ class DynamicFormEntry extends VerySimpleModel {
             if ($field->hasData() && !$field->isPresentationOnly())
                 $a->save();
         }
-        $this->_values = array();
+        $this->_values = null;
     }
 
     function delete() {
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index e0f834107810ade075abaf1c9c3f9afeb609a52b..7b75501d55fe8d1d9706eda5bcfe91bab72ded64 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -15,7 +15,9 @@ $pages = Page::getPages();
     </tr></thead>
     <tbody>
     <?php
-        $ost->company->getForm()->render();
+        $form = $ost->company->getForm();
+        $form->addMissingFields();
+        $form->render();
     ?>
     </tbody>
     <thead>