diff --git a/code/FormField/UserFormsCheckboxSetField.php b/code/FormField/UserFormsCheckboxSetField.php
index 43fb595d0..6338ff831 100644
--- a/code/FormField/UserFormsCheckboxSetField.php
+++ b/code/FormField/UserFormsCheckboxSetField.php
@@ -47,7 +47,7 @@ public function getOptions()
 
     public function getValueForValidation(): mixed
     {
-        $value = $this->Value();
+        $value = $this->getValue();
         if (is_iterable($value) || is_null($value)) {
             return $value;
         }
diff --git a/code/Model/Submission/SubmittedFileField.php b/code/Model/Submission/SubmittedFileField.php
index 8b3c73f4f..391577d92 100755
--- a/code/Model/Submission/SubmittedFileField.php
+++ b/code/Model/Submission/SubmittedFileField.php
@@ -36,10 +36,8 @@ class SubmittedFileField extends SubmittedFormField
     /**
      * Return the value of this field for inclusion into things such as
      * reports.
-     *
-     * @return string
      */
-    public function getFormattedValue()
+    public function getFormattedValue(): string
     {
         $name = $this->getFileName();
         $link = $this->getLink(false);
@@ -51,33 +49,33 @@ public function getFormattedValue()
                     // Logged in CMS user without permissions to view file in the CMS
                     $default = 'You don\'t have the right permissions to download this file';
                     $message = _t(__CLASS__ . '.INSUFFICIENTRIGHTS', $default);
-                    return DBField::create_field('HTMLText', sprintf(
+                    return sprintf(
                         '<i class="icon font-icon-lock"></i> %s - <em>%s</em>',
                         htmlspecialchars($name, ENT_QUOTES),
                         htmlspecialchars($message, ENT_QUOTES)
-                    ));
+                    );
                 } else {
                     // Userforms submission filled in by non-logged in user being emailed to recipient
                     $message = _t(__CLASS__ . '.YOUMUSTBELOGGEDIN', 'You must be logged in to view this file');
-                    return DBField::create_field('HTMLText', sprintf(
+                    return sprintf(
                         '%s - <a href="%s" target="_blank">%s</a> - <em>%s</em>',
                         htmlspecialchars($name, ENT_QUOTES),
                         htmlspecialchars($link, ENT_QUOTES),
                         htmlspecialchars($title, ENT_QUOTES),
                         htmlspecialchars($message, ENT_QUOTES)
-                    ));
+                    );
                 }
             } else {
                 // Logged in CMS user with permissions to view file in the CMS
-                return DBField::create_field('HTMLText', sprintf(
+                return sprintf(
                     '%s - <a href="%s" target="_blank">%s</a>',
                     htmlspecialchars($name, ENT_QUOTES),
                     htmlspecialchars($link, ENT_QUOTES),
                     htmlspecialchars($title, ENT_QUOTES)
-                ));
+                );
             }
         }
-        return false;
+        return '';
     }
 
     /**
diff --git a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
index 52e691e9f..34400836d 100644
--- a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
+++ b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
@@ -1,7 +1,7 @@
 <% if $Options.Count %>
     <% loop $Options %>
         <div class="$Class">
-            <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %>
+            <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$FormattedValue.ATT"<% if $isChecked %>
                    checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %>
                    $Top.getValidationAttributesHTML().RAW />
             <label for="$ID">$Title.XML</label>
diff --git a/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
index 85eb9f15e..a220dc016 100644
--- a/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
+++ b/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
@@ -1,6 +1,6 @@
 <% loop $Options %>
     <div class="$Class">
-        <input id="$ID" class="radio" name="$Name" type="radio" value="$Value.ATT"<% if $isChecked %>
+        <input id="$ID" class="radio" name="$Name" type="radio" value="$FormattedValue.ATT"<% if $isChecked %>
                checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %>
                $Top.getValidationAttributesHTML().RAW />
         <label for="$ID">$Title</label>
diff --git a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableDropdown.ss b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableDropdown.ss
index cf2d5e1f9..462f4ca50 100644
--- a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableDropdown.ss
+++ b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableDropdown.ss
@@ -1,5 +1,5 @@
 <select $AttributesHTML<% if $RightTitle %> aria-describedby="{$Name}_right_title"<% end_if %>>
 <% loop $Options %>
-	<option value="$Value.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
+	<option value="$FormattedValue.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
 <% end_loop %>
 </select>
diff --git a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss
index 790f73da5..fc24f9151 100644
--- a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss
+++ b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss
@@ -1 +1 @@
-<textarea $AttributesHTML<% if $RightTitle %> aria-describedby="{$Name}_right_title"<% end_if %>>$Value.HTMLATT</textarea>
+<textarea $AttributesHTML<% if $RightTitle %> aria-describedby="{$Name}_right_title"<% end_if %>>$FormattedValue.HTMLATT</textarea>
diff --git a/tests/php/Model/EditableFormField/EditableCountryDropdownFieldTest.php b/tests/php/Model/EditableFormField/EditableCountryDropdownFieldTest.php
index 4426ead80..cfbb85d41 100644
--- a/tests/php/Model/EditableFormField/EditableCountryDropdownFieldTest.php
+++ b/tests/php/Model/EditableFormField/EditableCountryDropdownFieldTest.php
@@ -38,7 +38,7 @@ public function testDefaultValue()
         /** @var EditableCountryDropdownField $field */
         $field = EditableCountryDropdownField::create();
         $field->Default = 'nz';
-        $this->assertEquals($field->getFormField()->Value(), 'nz');
+        $this->assertEquals($field->getFormField()->getValue(), 'nz');
     }
 
     public function testEmptyDefaultValue()