diff --git a/toolkit/templates/checkbox.rs.html b/toolkit/templates/checkbox.rs.html
new file mode 100644
index 0000000..4b75bae
--- /dev/null
+++ b/toolkit/templates/checkbox.rs.html
@@ -0,0 +1,12 @@
+@(name: &str, title: &str, checked: bool)
+
+<div>
+    <label>
+        @if checked {
+            <input type="checkbox" name="@name" checked />
+        } else {
+            <input type="checkbox" name="@name" />
+        }
+        <span>@title</span>
+    </label>
+</div>
diff --git a/toolkit/templates/text_input.rs.html b/toolkit/templates/text_input.rs.html
index 181aa13..12e5135 100644
--- a/toolkit/templates/text_input.rs.html
+++ b/toolkit/templates/text_input.rs.html
@@ -5,7 +5,7 @@
 
 <div class="@text_input.class_string()">
     @if let Some(title) = text_input.title.as_ref() {
-        <label for="@text_input.input.name" class="toolkit-input--label">
+        <label class="toolkit-input--label">
             <span class="toolkit-input--title">@title</span>
             @:input(&text_input.input)
         </label>