diff --git a/code/Model/Submission/SubmittedForm.php b/code/Model/Submission/SubmittedForm.php
index 32df390..8960050 100755
--- a/code/Model/Submission/SubmittedForm.php
+++ b/code/Model/Submission/SubmittedForm.php
@@ -101,6 +101,12 @@ class SubmittedForm extends DataObject
                     ->addExtraClass('form-field--no-divider')
             );
 
+            $fields->insertAfter('Submitter', ReadonlyField::create('Created', _t(__CLASS__ . '.CREATED', 'Created'), $this->Created)
+                                       ->addExtraClass('form-field--no-divider'));
+
+            $fields->insertAfter('Created', ReadonlyField::create('LastEdited', _t(__CLASS__ . '.LASTEDITED', 'Last changed'), $this->LastEdited)
+                                       ->addExtraClass('form-field--no-divider'));
+
             $values = GridField::create(
                 'Values',
                 SubmittedFormField::class,
diff --git a/code/UserForm.php b/code/UserForm.php
index 35c9dac..e29414d 100644
--- a/code/UserForm.php
+++ b/code/UserForm.php
@@ -303,11 +303,7 @@ SQL;
         $config->addComponent($print = new GridFieldPrintButton('buttons-after-left'));
 
         // show user form items in the summary tab
-        $summaryarray = array(
-            'ID' => 'ID',
-            'Created' => 'Created',
-            'LastEdited' => 'Last Edited'
-        );
+        $summaryarray = SubmittedForm::singleton()->summaryFields();
 
         foreach (EditableFormField::get()->filter(['ParentID' => $parentID, 'ShowInSummary' => 1]) as $eff) {
             $summaryarray[$eff->Name] = $eff->Title ?: $eff->Name;