diff --git a/templates/forms/CheckboxSetField.ss b/templates/forms/CheckboxSetField.ss
index 49c298da0..847c153f2 100644
--- a/templates/forms/CheckboxSetField.ss
+++ b/templates/forms/CheckboxSetField.ss
@@ -2,8 +2,8 @@
 	<% if $Options.Count %>
 		<% loop $Options %>
 			<li class="$Class">
-				<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
-				<label for="$ID">$Title</label>
+				<input id="$ID" class="checkbox" name="$Name.XML" type="checkbox" value="$Value.ATT"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
+				<label for="$ID">$Title.XML</label>
 			</li> 
 		<% end_loop %>
 	<% else %>
diff --git a/templates/forms/DropdownField.ss b/templates/forms/DropdownField.ss
index 5d5c24d04..13458e7fa 100644
--- a/templates/forms/DropdownField.ss
+++ b/templates/forms/DropdownField.ss
@@ -1,5 +1,5 @@
 <select $AttributesHTML>
 <% loop $Options %>
-	<option value="$Value.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
+	<option value="$Value.ATT"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
 <% end_loop %>
 </select>
diff --git a/templates/forms/OptionsetField.ss b/templates/forms/OptionsetField.ss
index bb8818a6f..f8124042c 100644
--- a/templates/forms/OptionsetField.ss
+++ b/templates/forms/OptionsetField.ss
@@ -1,8 +1,8 @@
 <ul id="$ID" class="$extraClass">
 	<% loop $Options %>
 		<li class="$Class">
-			<input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
-			<label for="$ID">$Title</label>
+			<input id="$ID" class="radio" name="$Name.ATT" type="radio" value="$Value.ATT"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
+			<label for="$ID">$Title.XML</label>
 		</li>
 	<% end_loop %>
 </ul>
diff --git a/tests/forms/CheckboxSetFieldTest.php b/tests/forms/CheckboxSetFieldTest.php
index ac4bc22d6..e99b64c49 100644
--- a/tests/forms/CheckboxSetFieldTest.php
+++ b/tests/forms/CheckboxSetFieldTest.php
@@ -144,6 +144,17 @@ class CheckboxSetFieldTest extends SapphireTest {
 		$this->assertEquals('Test,Another', $dbValue);
 	}
 
+	public function testEscapedOptions() {
+		$field = new CheckboxSetField('Content', 'Content', array(
+			'Test' => 'Test',
+			'Another<weirdvalue>' => 'Another',
+		));
+
+		$html = $field->Field();
+		$this->assertContains('Content[Another&lt;weirdvalue&gt;]', $html, 'Option name is escaped');
+		$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
+	}
+
 }
 
 /**
diff --git a/tests/forms/DropdownFieldTest.php b/tests/forms/DropdownFieldTest.php
index 1167cc5f4..8d9020565 100644
--- a/tests/forms/DropdownFieldTest.php
+++ b/tests/forms/DropdownFieldTest.php
@@ -208,7 +208,17 @@ class DropdownFieldTest extends SapphireTest {
 		$disabledOptions = $this->findDisabledOptionElements($field->Field());
 		$this->assertEquals(count($disabledOptions), 0, 'There are no disabled options');
 	}
-	
+
+	public function testEscapedOptions() {
+		$field = new DropdownField('Content', 'Content', array(
+			'Test' => 'Test',
+			'Another<weirdvalue>' => 'Another',
+		));
+
+		$html = $field->Field();
+		$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
+	}
+
 	/**
 	 * Create a test dropdown field, with the option to
 	 * set what source and blank value it should contain
@@ -293,4 +303,4 @@ class DropdownFieldTest extends SapphireTest {
 		return $foundDisabled;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/tests/forms/OptionsetFieldTest.php b/tests/forms/OptionsetFieldTest.php
index 81d66fe77..d03b262a4 100644
--- a/tests/forms/OptionsetFieldTest.php
+++ b/tests/forms/OptionsetFieldTest.php
@@ -34,4 +34,15 @@ class OptionsetFieldTest extends SapphireTest {
 		preg_match('/Yes/', $field->Field(), $matches);
 		$this->assertEquals($matches[0], 'Yes');
 	}
+
+	public function testEscapedOptions() {
+		$field = new OptionsetField('Content', 'Content', array(
+			'Test' => 'Test',
+			'Another<weirdvalue>' => 'Another',
+		));
+
+		$html = $field->Field();
+		$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
+	}
+
 }