diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxSetField.ss b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxSetField.ss
index 7a9576499..8d10f9675 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxSetField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxSetField.ss
@@ -3,7 +3,7 @@
 		<% loop $Options %>
 			<div class="checkbox form-check $Class">
 				<label class="form-check-label">
-					<input id="$ID" class="checkbox form-check-input" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
+					<input id="$ID" class="checkbox form-check-input" name="$Name" type="checkbox" value="$FormattedValue"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
 					$Title
 				</label>
 			</div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField.ss b/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField.ss
index 78ccdf943..be622c77a 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField.ss
@@ -2,7 +2,7 @@
 	<% loop $Options %>
 		<div class="radio form-check $Class">
 			<label class="form-check-label">
-				<input class="form-check-input" id="$ID" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %> />
+				<input class="form-check-input" id="$ID" name="$Name" type="radio" value="$FormattedValue"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %> />
 				$Title
 			</label>
 		</div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/ReadonlyField.ss b/themes/cms-forms/templates/SilverStripe/Forms/ReadonlyField.ss
index 6f550d6b6..53587093f 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/ReadonlyField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/ReadonlyField.ss
@@ -1,5 +1,5 @@
 <p id="$ID" tabIndex="0" class="form-control-static<% if $extraClass %> $extraClass<% end_if %>" <% include SilverStripe/Forms/AriaAttributes %>>
-	$Value
+	$FormattedValue
 </p>
 <% if $IncludeHiddenField %>
 	<input $getAttributesHTML("id", "type") id="hidden-{$ID}" type="hidden" />