diff --git a/examples/forms/templates/index.html.tera b/examples/forms/templates/index.html.tera
index 4e43a8a8..745880ea 100644
--- a/examples/forms/templates/index.html.tera
+++ b/examples/forms/templates/index.html.tera
@@ -89,13 +89,13 @@
             <div class="col">
               <label>Applicable Categories</label>
               <br />
-              {{ m::checkbox(name="submission.category", value="Biology") }}
+              {{ m::checkbox(name="submission.category", label="Biology", value="Biology") }}
               <br />
-              {{ m::checkbox(name="submission.category", value="Chemistry") }}
+              {{ m::checkbox(name="submission.category", label="Chemistry", value="Chemistry") }}
               <br />
-              {{ m::checkbox(name="submission.category", value="Physics") }}
+              {{ m::checkbox(name="submission.category", label="Chemistry", value="Physics") }}
               <br />
-              {{ m::checkbox(name="submission.category", value="CS") }}
+              {{ m::checkbox(name="submission.category", label="CS", value="CS") }}
             </div>
           </div>
 
@@ -125,8 +125,7 @@
 
           <div class="row">
             <div class="col">
-                {{ m::checkbox(name="submission.ready", value="Submission is
-                ready for review.") }}
+                {{ m::checkbox(name="submission.ready", label="Submission is ready for review.") }}
             </div>
           </div>
 
diff --git a/examples/forms/templates/macros.html.tera b/examples/forms/templates/macros.html.tera
index d7f8a05f..2b0128c3 100644
--- a/examples/forms/templates/macros.html.tera
+++ b/examples/forms/templates/macros.html.tera
@@ -25,9 +25,9 @@
     {{ self::errors_for(name=name) }}
 {% endmacro input %}
 
-{% macro checkbox(name, value) %}
+{% macro checkbox(name, label, value="yes") %}
     <label {% if name in errors %} class="bd-error" {% endif %}>
-    <input type="checkbox" name="{{ name }}" value="{{ value }}"
+    <input type="checkbox" name="{{ name }}" value={{ value }}
     {% if name in values %}
         {% set field_values = values | get(key=name) %}
         {% if field_values is containing(value) %}
@@ -35,7 +35,7 @@
         {% endif %}
     {% endif %}
     >
-        {{ value }}
+        {{ label }}
     </label>
 {% endmacro input %}