diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php
index bf7030c..9a0e1fd 100644
--- a/code/Control/UserDefinedFormController.php
+++ b/code/Control/UserDefinedFormController.php
@@ -166,9 +166,9 @@ class UserDefinedFormController extends PageController
 
         $watch = [];
 
-        if ($this->Fields()) {
+        if ($this->data()->Fields()) {
             /** @var EditableFormField $field */
-            foreach ($this->Fields() as $field) {
+            foreach ($this->data()->Fields() as $field) {
                 if ($result = $field->formatDisplayRules()) {
                     $watch[] = $result;
                 }
@@ -216,7 +216,7 @@ JS
         $attachments = array();
         $submittedFields = ArrayList::create();
 
-        foreach ($this->Fields() as $field) {
+        foreach ($this->data()->Fields() as $field) {
             if (!$field->showInReports()) {
                 continue;
             }
diff --git a/code/Form/UserForm.php b/code/Form/UserForm.php
index b915a7e..a22ae41 100644
--- a/code/Form/UserForm.php
+++ b/code/Form/UserForm.php
@@ -122,7 +122,7 @@ class UserForm extends Form
         $fields = new UserFormsFieldList();
         $target = $fields;
 
-        foreach ($this->controller->Fields() as $field) {
+        foreach ($this->controller->data()->Fields() as $field) {
             $target = $target->processNext($field);
         }
         $fields->clearEmptySteps();
@@ -170,6 +170,7 @@ class UserForm extends Form
         // Generate required field validator
         $requiredNames = $this
             ->getController()
+            ->data()
             ->Fields()
             ->filter('Required', true)
             ->column('Name');