diff --git a/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java b/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
index a3cfe78cb..5d2ddebb6 100644
--- a/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
+++ b/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
@@ -69,7 +69,7 @@ public String generateHtml(FormEntryContext context) {
 		
 		return checkboxWidgets.stream().map(checkboxWidget -> {
 			return checkboxWidget.generateHtml(context);
-		}).map((html) -> "<span" + (clazz != null ? " class=\"" + clazz + "\" " : "") + ">" + html + "</span>")
+		}).map((html) -> "<field" + (clazz != null ? " class=\"" + clazz + "\" " : "") + ">" + html + "</field>")
 		        .collect(Collectors.joining());
 	}