diff --git a/api-tests/src/test/java/org/openmrs/module/htmlformentry/ScheduleAppointmentTagTest.java b/api-tests/src/test/java/org/openmrs/module/htmlformentry/ScheduleAppointmentTagTest.java
index 2e4edf6da..2ab42cd1a 100644
--- a/api-tests/src/test/java/org/openmrs/module/htmlformentry/ScheduleAppointmentTagTest.java
+++ b/api-tests/src/test/java/org/openmrs/module/htmlformentry/ScheduleAppointmentTagTest.java
@@ -35,12 +35,14 @@ public class ScheduleAppointmentTagTest extends BaseHtmlFormEntryTest {
 	// Text concept added in scheduleAppointmentTest.xml for storing appointment UUID obs
 	private static final String APPT_UUID_CONCEPT = "c36006e5-9fbb-4f20-866b-0ece245615a7";
 
-	// Widget-label note: date and time widgets are found via the "Timing" section
-	// label as a stable anchor. "Timing!!2" = allday hidden input (3rd name="w" after
-	// "Timing"), "Timing!!3" = appointment date hidden input (4th), "Timing!!4" =
-	// time-hours select (5th). Using "Date##N" labels is fragile because the shared
-	// html variable in getLabeledWidgets is mutated by ## processing, making
-	// consecutive "Date##N" label lookups interact unexpectedly.
+	// Widget-label note: the date/time widgets have no text label of their own that's safe to
+	// anchor on ("Date" also matches the earlier "Encounter Date:" widget, and the wrapper's CSS
+	// class name is also a substring of the <style> block emitted earlier in the HTML). Anchor on
+	// the literal opening tag of the date/time wrapper instead: DATE_TIME_ANCHOR (no suffix) = the
+	// appointment date hidden input (1st name="w" after the anchor), DATE_TIME_ANCHOR + "!!1" =
+	// the time-hours select (2nd name="w" after the anchor; minutes/seconds are derived by
+	// replacing "hours" in that field name).
+	private static final String DATE_TIME_ANCHOR = "<p class=\"schedule-appointment-date-time\">";
 
 	@Before
 	public void loadTestData() throws Exception {
@@ -338,7 +340,7 @@ public void testBlankFormHtml(String html) {
 	}
 
 	// ---------------------------------------------------------------
-	// Submission tests — specific-time appointment
+	// Submission tests
 	// ---------------------------------------------------------------
 
 	@Test
@@ -353,7 +355,7 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
@@ -362,10 +364,9 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-01-15");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
 
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
 				request.setParameter(timeBase + "hours", "10");
 				request.setParameter(timeBase + "minutes", "30");
 				request.setParameter(timeBase + "seconds", "0");
@@ -410,13 +411,12 @@ public void testResults(SubmissionResults results) {
 		}.run();
 	}
 
-
 	// ---------------------------------------------------------------
-	// Submission tests — all-day appointment
+	// Inline validation tests
 	// ---------------------------------------------------------------
 
 	@Test
-	public void scheduleAppointmentTag_shouldCreateAllDayAppointment() throws Exception {
+	public void scheduleAppointmentTag_shouldRequireServiceInlineNotAsGlobalError() throws Exception {
 		new RegressionTestHelper() {
 
 			@Override
@@ -427,48 +427,40 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
 			public void setupRequest(MockHttpServletRequest request, Map<String, String> widgets) {
-				request.setParameter(widgets.get("Encounter Date:"), "2025-03-10");
+				request.setParameter(widgets.get("Encounter Date:"), "2025-01-15");
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
-				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
+				// Service intentionally omitted
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "allday");
-				request.setParameter(widgets.get("Timing!!3"), "2025-03-10");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
+
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
+				request.setParameter(timeBase + "hours", "10");
+				request.setParameter(timeBase + "minutes", "30");
+				request.setParameter(timeBase + "seconds", "0");
+
+				request.setParameter(widgets.get("Duration (minutes)"), "30");
 				request.setParameter(widgets.get("Provider") + "_hid", PROVIDER_ID);
-				// No time or duration — not required for all-day
 			}
 
 			@Override
 			public void testResults(SubmissionResults results) {
-				results.assertNoErrors();
-
-				AppointmentSearchRequest searchRequest = new AppointmentSearchRequest();
-				searchRequest.setPatientUuid(PATIENT_UUID);
-				searchRequest.setStartDate(new Date(0));
-				List<Appointment> appointments = Context.getService(AppointmentsService.class).search(searchRequest);
-				Assert.assertEquals(1, appointments.size());
-
-				Appointment appt = appointments.get(0);
-
-				Calendar startCal = Calendar.getInstance();
-				startCal.setTime(appt.getStartDateTime());
-				Assert.assertEquals(0, startCal.get(Calendar.HOUR_OF_DAY));
-				Assert.assertEquals(0, startCal.get(Calendar.MINUTE));
-
-				Calendar endCal = Calendar.getInstance();
-				endCal.setTime(appt.getEndDateTime());
-				Assert.assertEquals(23, endCal.get(Calendar.HOUR_OF_DAY));
-				Assert.assertEquals(59, endCal.get(Calendar.MINUTE));
+				// Must produce an inline validation error, not reach handleSubmission
+				// (which would throw a global "Appointment cannot be created without Service")
+				results.assertErrors();
+				Assert.assertTrue("Expected inline 'Service is required' error",
+				        results.getValidationErrors().stream()
+				                .anyMatch(e -> e.getError().contains("Service is required")));
 			}
 		}.run();
 	}
 
 	@Test
-	public void scheduleAppointmentTag_shouldNotRequireDurationForAllDayAppointment() throws Exception {
+	public void scheduleAppointmentTag_shouldRequireLocationInline() throws Exception {
 		new RegressionTestHelper() {
 
 			@Override
@@ -479,33 +471,38 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
 			public void setupRequest(MockHttpServletRequest request, Map<String, String> widgets) {
-				request.setParameter(widgets.get("Encounter Date:"), "2025-03-10");
-				request.setParameter(widgets.get("Location"), KIGALI_UUID);
+				request.setParameter(widgets.get("Encounter Date:"), "2025-01-15");
+				// Location intentionally omitted
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "allday");
-				request.setParameter(widgets.get("Timing!!3"), "2025-03-10");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
+
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
+				request.setParameter(timeBase + "hours", "10");
+				request.setParameter(timeBase + "minutes", "30");
+				request.setParameter(timeBase + "seconds", "0");
+
+				request.setParameter(widgets.get("Duration (minutes)"), "30");
 				request.setParameter(widgets.get("Provider") + "_hid", PROVIDER_ID);
 			}
 
 			@Override
 			public void testResults(SubmissionResults results) {
-				results.assertNoErrors();
+				results.assertErrors();
+				Assert.assertTrue("Expected inline 'Location is required' error",
+				        results.getValidationErrors().stream()
+				                .anyMatch(e -> e.getError().contains("Location is required")));
 			}
 		}.run();
 	}
 
-	// ---------------------------------------------------------------
-	// Inline validation tests
-	// ---------------------------------------------------------------
-
 	@Test
-	public void scheduleAppointmentTag_shouldRequireServiceInlineNotAsGlobalError() throws Exception {
+	public void scheduleAppointmentTag_shouldRequireProviderInline() throws Exception {
 		new RegressionTestHelper() {
 
 			@Override
@@ -516,41 +513,38 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
 			public void setupRequest(MockHttpServletRequest request, Map<String, String> widgets) {
 				request.setParameter(widgets.get("Encounter Date:"), "2025-01-15");
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
-				// Service intentionally omitted
+				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-01-15");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
 
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
 				request.setParameter(timeBase + "hours", "10");
 				request.setParameter(timeBase + "minutes", "30");
 				request.setParameter(timeBase + "seconds", "0");
 
 				request.setParameter(widgets.get("Duration (minutes)"), "30");
-				request.setParameter(widgets.get("Provider") + "_hid", PROVIDER_ID);
+				// Provider intentionally omitted
 			}
 
 			@Override
 			public void testResults(SubmissionResults results) {
-				// Must produce an inline validation error, not reach handleSubmission
-				// (which would throw a global "Appointment cannot be created without Service")
 				results.assertErrors();
-				Assert.assertTrue("Expected inline 'Service is required' error",
+				Assert.assertTrue("Expected inline 'Provider is required' error",
 				        results.getValidationErrors().stream()
-				                .anyMatch(e -> e.getError().contains("Service is required")));
+				                .anyMatch(e -> e.getError().contains("Provider is required")));
 			}
 		}.run();
 	}
 
 	@Test
-	public void scheduleAppointmentTag_shouldRequireLocationInline() throws Exception {
+	public void scheduleAppointmentTag_shouldRequireTimeInline() throws Exception {
 		new RegressionTestHelper() {
 
 			@Override
@@ -561,22 +555,17 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
 			public void setupRequest(MockHttpServletRequest request, Map<String, String> widgets) {
 				request.setParameter(widgets.get("Encounter Date:"), "2025-01-15");
-				// Location intentionally omitted
+				request.setParameter(widgets.get("Location"), KIGALI_UUID);
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-01-15");
-
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
-				request.setParameter(timeBase + "hours", "10");
-				request.setParameter(timeBase + "minutes", "30");
-				request.setParameter(timeBase + "seconds", "0");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
+				// Time intentionally omitted
 
 				request.setParameter(widgets.get("Duration (minutes)"), "30");
 				request.setParameter(widgets.get("Provider") + "_hid", PROVIDER_ID);
@@ -585,15 +574,15 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 			@Override
 			public void testResults(SubmissionResults results) {
 				results.assertErrors();
-				Assert.assertTrue("Expected inline 'Location is required' error",
+				Assert.assertTrue("Expected inline 'Appointment time is required' error",
 				        results.getValidationErrors().stream()
-				                .anyMatch(e -> e.getError().contains("Location is required")));
+				                .anyMatch(e -> e.getError().contains("Appointment time is required")));
 			}
 		}.run();
 	}
 
 	@Test
-	public void scheduleAppointmentTag_shouldRequireProviderInline() throws Exception {
+	public void scheduleAppointmentTag_shouldRequireDurationInline() throws Exception {
 		new RegressionTestHelper() {
 
 			@Override
@@ -604,7 +593,7 @@ public String getFormName() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
@@ -613,24 +602,23 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-01-15");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
 
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
 				request.setParameter(timeBase + "hours", "10");
 				request.setParameter(timeBase + "minutes", "30");
 				request.setParameter(timeBase + "seconds", "0");
 
-				request.setParameter(widgets.get("Duration (minutes)"), "30");
-				// Provider intentionally omitted
+				// Duration intentionally omitted
+				request.setParameter(widgets.get("Provider") + "_hid", PROVIDER_ID);
 			}
 
 			@Override
 			public void testResults(SubmissionResults results) {
 				results.assertErrors();
-				Assert.assertTrue("Expected inline 'Provider is required' error",
+				Assert.assertTrue("Expected inline 'Duration is required' error",
 				        results.getValidationErrors().stream()
-				                .anyMatch(e -> e.getError().contains("Provider is required")));
+				                .anyMatch(e -> e.getError().contains("Duration is required")));
 			}
 		}.run();
 	}
@@ -695,7 +683,8 @@ public String getFormXml() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Schedule appointment", "Location", "Service",
-				        "Appointment Type", "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        "Appointment Type", DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)",
+				        "Provider" };
 			}
 
 			@Override
@@ -705,10 +694,9 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-02-20");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-02-20");
 
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
 				request.setParameter(timeBase + "hours", "14");
 				request.setParameter(timeBase + "minutes", "0");
 				request.setParameter(timeBase + "seconds", "0");
@@ -817,7 +805,7 @@ public String getFormXml() {
 			@Override
 			public String[] widgetLabels() {
 				return new String[] { "Encounter Date:", "Location", "Service", "Appointment Type",
-				        "Timing!!2", "Timing!!3", "Timing!!4", "Duration (minutes)", "Provider" };
+				        DATE_TIME_ANCHOR, DATE_TIME_ANCHOR + "!!1", "Duration (minutes)", "Provider" };
 			}
 
 			@Override
@@ -826,10 +814,9 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 				request.setParameter(widgets.get("Location"), KIGALI_UUID);
 				request.setParameter(widgets.get("Service"), CONSULTATION_UUID);
 				request.setParameter(widgets.get("Appointment Type"), AppointmentKind.Scheduled.name());
-				request.setParameter(widgets.get("Timing!!2"), "specific");
-				request.setParameter(widgets.get("Timing!!3"), "2025-01-15");
+				request.setParameter(widgets.get(DATE_TIME_ANCHOR), "2025-01-15");
 
-				String timeBase = widgets.get("Timing!!4").replace("hours", "");
+				String timeBase = widgets.get(DATE_TIME_ANCHOR + "!!1").replace("hours", "");
 				request.setParameter(timeBase + "hours", "10");
 				request.setParameter(timeBase + "minutes", "30");
 				request.setParameter(timeBase + "seconds", "0");
diff --git a/api/src/main/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElement.java b/api/src/main/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElement.java
index b042f4cfa..f270be1f7 100644
--- a/api/src/main/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElement.java
+++ b/api/src/main/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElement.java
@@ -52,7 +52,6 @@
 import org.openmrs.module.htmlformentry.widget.NumberFieldWidget;
 import org.openmrs.module.htmlformentry.widget.TextFieldWidget;
 import org.openmrs.module.htmlformentry.widget.TimeWidget;
-import org.openmrs.util.OpenmrsUtil;
 
 public class ScheduleAppointmentElement implements HtmlGeneratorElement, FormSubmissionControllerAction {
 
@@ -76,9 +75,6 @@ public class ScheduleAppointmentElement implements HtmlGeneratorElement, FormSub
 
 	private TextFieldWidget noteWidget;
 
-	// Hidden field tracking "allday" vs "specific" radio state
-	private TextFieldWidget allDayWidget;
-
 	private NumberFieldWidget durationWidget;
 
 	private ErrorWidget locationErrorWidget;
@@ -252,10 +248,6 @@ public ScheduleAppointmentElement(FormEntryContext context, Map<String, String>
 			context.registerErrorWidget(startDateTimeWidget, startDateTimeErrorWidget);
 			context.registerWidget(timeErrorWidget);
 
-			// --- All-day toggle (hidden field; value set by JS radio buttons) ---
-			allDayWidget = new TextFieldWidget();
-			context.registerWidget(allDayWidget);
-
 			// --- Duration ---
 			durationWidget = new NumberFieldWidget(1.0, null, false);
 			durationErrorWidget = new ErrorWidget();
@@ -288,8 +280,6 @@ public String generateHtml(FormEntryContext context) {
 		sb.append(".schedule-appointment p>label{display:block;margin-bottom:0.2em;}");
 		sb.append(".schedule-appointment .field-widget{display:flex;align-items:center;gap:0.25em;flex-wrap:wrap;}");
 		sb.append(".schedule-appointment-choice label{display:inline-flex;align-items:center;gap:0.3em;cursor:pointer;margin-right:1em;}");
-		sb.append(".schedule-appointment-timing-options{display:flex;gap:1.5em;align-items:center;}");
-		sb.append(".schedule-appointment-timing-option{display:inline-flex;align-items:center;gap:0.3em;cursor:pointer;}");
 		sb.append(".schedule-appointment-date-time-widget{display:inline-flex;align-items:center;gap:0.5em;flex-wrap:wrap;}");
 		sb.append(".schedule-appt-time{display:inline-flex;align-items:center;gap:0.25em;}");
 		sb.append("</style>");
@@ -332,28 +322,7 @@ public String generateHtml(FormEntryContext context) {
 			        .append("\" value=\"").append(typeWidget.getOptions().get(0).getValue()).append("\"/>");
 		}
 
-		// All-day / Specific-time toggle — shown BEFORE the date/time row
-		String allDayFieldName = context.getFieldName(allDayWidget);
-		sb.append("<p class=\"schedule-appointment-timing\">");
-		sb.append("<label>").append(msg("htmlformentry.scheduleAppointment.timing"))
-		        .append(" <span class=\"required\">*</span></label>");
-		sb.append("<span class=\"field-widget schedule-appointment-timing-options\">");
-		sb.append("<label class=\"schedule-appointment-timing-option\"><input type=\"radio\" name=\"").append(allDayFieldName).append("-radio\" value=\"allday\"")
-		        .append(" onchange=\"this.closest('.schedule-appointment').querySelector('.schedule-appt-allday').value='allday';")
-		        .append("this.closest('.schedule-appointment').querySelector('.schedule-appt-time').style.display='none';")
-		        .append("this.closest('.schedule-appointment').querySelector('.schedule-appt-duration').style.display='none';\"> ")
-		        .append(msg("htmlformentry.scheduleAppointment.allDay")).append("</label>");
-		sb.append("<label class=\"schedule-appointment-timing-option\"><input type=\"radio\" name=\"").append(allDayFieldName).append("-radio\" value=\"specific\" checked")
-		        .append(" onchange=\"this.closest('.schedule-appointment').querySelector('.schedule-appt-allday').value='specific';")
-		        .append("this.closest('.schedule-appointment').querySelector('.schedule-appt-time').style.display='inline-flex';")
-		        .append("this.closest('.schedule-appointment').querySelector('.schedule-appt-duration').style.display='block';\"> ")
-		        .append(msg("htmlformentry.scheduleAppointment.specificTime")).append("</label>");
-		sb.append("</span>");
-		sb.append("<input type=\"hidden\" name=\"").append(allDayFieldName)
-		        .append("\" class=\"schedule-appt-allday\" value=\"specific\"/>");
-		sb.append("</p>");
-
-		// Date + Time on one line; time portion shown/hidden by the toggle above
+		// Date + Time
 		sb.append("<p class=\"schedule-appointment-date-time\">");
 		sb.append("<label>").append(msg("htmlformentry.scheduleAppointment.date"))
 		        .append(" <span class=\"required\">*</span></label>");
@@ -370,13 +339,11 @@ public String generateHtml(FormEntryContext context) {
 			.append(context.getFieldName(startDateTimeWidget.getDateWidget())).append("', '")
 			.append(context.getFieldName(startDateTimeWidget.getTimeWidget())).append("')</script>");
 
-		// Duration (shown only for specific-time)
-		sb.append("<div class=\"schedule-appt-duration\">");
+		// Duration
 		sb.append(fieldRow("schedule-appointment-duration",
 		    msg("htmlformentry.scheduleAppointment.duration"),
 		    durationWidget.generateHtml(context) + durationErrorWidget.generateHtml(context),
 		    true));
-		sb.append("</div>");
 
 		// Provider
 		sb.append(fieldRow("schedule-appointment-provider",
@@ -503,27 +470,22 @@ public Collection<FormSubmissionError> validateSubmission(FormEntryContext conte
 			        msg("htmlformentry.scheduleAppointment.error.dateRequired")));
 		}
 
-		// Time and duration required only for specific-time appointments
-		String allDayValue = (String) allDayWidget.getValue(context, submission);
-		boolean isAllDay = "allday".equals(allDayValue);
-		if (!isAllDay) {
-			Date time = (Date) startDateTimeWidget.getTimeWidget().getValue(context, submission);
-			if (time == null) {
-				errors.add(new FormSubmissionError(context.getFieldName(timeErrorWidget),
-				        msg("htmlformentry.scheduleAppointment.error.timeRequired")));
-			}
+		Date time = (Date) startDateTimeWidget.getTimeWidget().getValue(context, submission);
+		if (time == null) {
+			errors.add(new FormSubmissionError(context.getFieldName(timeErrorWidget),
+			        msg("htmlformentry.scheduleAppointment.error.timeRequired")));
+		}
 
-			Number durNum = null;
-			try {
-				durNum = (Number) durationWidget.getValue(context, submission);
-			}
-			catch (IllegalArgumentException e) {
-				// non-numeric input — falls through to error
-			}
-			if (durNum == null || durNum.intValue() < 1) {
-				errors.add(new FormSubmissionError(context.getFieldName(durationErrorWidget),
-				        msg("htmlformentry.scheduleAppointment.error.durationRequired")));
-			}
+		Number durNum = null;
+		try {
+			durNum = (Number) durationWidget.getValue(context, submission);
+		}
+		catch (IllegalArgumentException e) {
+			// non-numeric input — falls through to error
+		}
+		if (durNum == null || durNum.intValue() < 1) {
+			errors.add(new FormSubmissionError(context.getFieldName(durationErrorWidget),
+			        msg("htmlformentry.scheduleAppointment.error.durationRequired")));
 		}
 
 		Provider provider = (Provider) providerWidget.getValue(context, submission);
@@ -552,8 +514,6 @@ public void handleSubmission(FormEntrySession session, HttpServletRequest submis
 		String serviceUuid = (String) serviceWidget.getValue(context, submission);
 		String typeValue = (String) typeWidget.getValue(context, submission);
 		Date date = (Date) startDateTimeWidget.getDateWidget().getValue(context, submission);
-		String allDayValue = (String) allDayWidget.getValue(context, submission);
-		boolean isAllDay = "allday".equals(allDayValue);
 		Provider selectedProvider = (Provider) providerWidget.getValue(context, submission);
 		String note = (String) noteWidget.getValue(context, submission);
 
@@ -563,44 +523,34 @@ public void handleSubmission(FormEntrySession session, HttpServletRequest submis
 		// Build start datetime
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(date);
-		if (!isAllDay) {
-			Date time = (Date) startDateTimeWidget.getTimeWidget().getValue(context, submission);
-			if (time != null) {
-				Calendar timeCal = Calendar.getInstance();
-				timeCal.setTime(time);
-				cal.set(Calendar.HOUR_OF_DAY, timeCal.get(Calendar.HOUR_OF_DAY));
-				cal.set(Calendar.MINUTE, timeCal.get(Calendar.MINUTE));
-			}
-		} else {
-			cal.set(Calendar.HOUR_OF_DAY, 0);
-			cal.set(Calendar.MINUTE, 0);
+		Date time = (Date) startDateTimeWidget.getTimeWidget().getValue(context, submission);
+		if (time != null) {
+			Calendar timeCal = Calendar.getInstance();
+			timeCal.setTime(time);
+			cal.set(Calendar.HOUR_OF_DAY, timeCal.get(Calendar.HOUR_OF_DAY));
+			cal.set(Calendar.MINUTE, timeCal.get(Calendar.MINUTE));
 		}
 		cal.set(Calendar.SECOND, 0);
 		cal.set(Calendar.MILLISECOND, 0);
 		Date startDateTime = cal.getTime();
 
 		// Build end datetime
-		Date endDateTime;
-		if (isAllDay) {
-			endDateTime = OpenmrsUtil.getLastMomentOfDay(date);
-		} else {
-			Integer durationMins = null;
-			try {
-				Number durNum = (Number) durationWidget.getValue(context, submission);
-				if (durNum != null) {
-					durationMins = durNum.intValue();
-				}
-			}
-			catch (IllegalArgumentException e) {
-				// non-numeric input — validation should have caught this
-			}
-			if (durationMins == null && service != null) {
-				durationMins = service.getDurationMins();
+		Integer durationMins = null;
+		try {
+			Number durNum = (Number) durationWidget.getValue(context, submission);
+			if (durNum != null) {
+				durationMins = durNum.intValue();
 			}
-			endDateTime = durationMins != null
-			        ? new Date(startDateTime.getTime() + (long) durationMins * 60 * 1000)
-			        : null;
 		}
+		catch (IllegalArgumentException e) {
+			// non-numeric input — validation should have caught this
+		}
+		if (durationMins == null && service != null) {
+			durationMins = service.getDurationMins();
+		}
+		Date endDateTime = durationMins != null
+		        ? new Date(startDateTime.getTime() + (long) durationMins * 60 * 1000)
+		        : null;
 
 		Appointment appointment = new Appointment();
 		appointment.setPatient(session.getPatient());
diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
index 74bbb3990..47f6b033f 100644
--- a/api/src/main/resources/messages.properties
+++ b/api/src/main/resources/messages.properties
@@ -196,9 +196,7 @@ htmlformentry.scheduleAppointment.service=Service
 htmlformentry.scheduleAppointment.appointmentType=Appointment Type
 htmlformentry.scheduleAppointment.date=Date
 htmlformentry.scheduleAppointment.appointmentTime=Time
-htmlformentry.scheduleAppointment.timing=Timing
 htmlformentry.scheduleAppointment.allDay=All day
-htmlformentry.scheduleAppointment.specificTime=Specific time
 htmlformentry.scheduleAppointment.duration=Duration (minutes)
 htmlformentry.scheduleAppointment.provider=Provider
 htmlformentry.scheduleAppointment.note=Note
diff --git a/api/src/main/resources/messages_es.properties b/api/src/main/resources/messages_es.properties
index 06408fd42..a0ad25efd 100644
--- a/api/src/main/resources/messages_es.properties
+++ b/api/src/main/resources/messages_es.properties
@@ -186,9 +186,7 @@ htmlformentry.scheduleAppointment.service=Servicio
 htmlformentry.scheduleAppointment.appointmentType=Tipo de cita
 htmlformentry.scheduleAppointment.date=Fecha
 htmlformentry.scheduleAppointment.appointmentTime=Hora
-htmlformentry.scheduleAppointment.timing=Horario
 htmlformentry.scheduleAppointment.allDay=Todo el día
-htmlformentry.scheduleAppointment.specificTime=Hora específica
 htmlformentry.scheduleAppointment.duration=Duración (minutos)
 htmlformentry.scheduleAppointment.provider=Proveedor
 htmlformentry.scheduleAppointment.note=Nota
diff --git a/api/src/main/resources/messages_fr.properties b/api/src/main/resources/messages_fr.properties
index 8a3c93cc1..b4c1a6a52 100644
--- a/api/src/main/resources/messages_fr.properties
+++ b/api/src/main/resources/messages_fr.properties
@@ -186,9 +186,7 @@ htmlformentry.scheduleAppointment.service=Service
 htmlformentry.scheduleAppointment.appointmentType=Type de rendez-vous
 htmlformentry.scheduleAppointment.date=Date
 htmlformentry.scheduleAppointment.appointmentTime=Heure
-htmlformentry.scheduleAppointment.timing=Horaire
 htmlformentry.scheduleAppointment.allDay=Toute la journée
-htmlformentry.scheduleAppointment.specificTime=Heure précise
 htmlformentry.scheduleAppointment.duration=Durée (minutes)
 htmlformentry.scheduleAppointment.provider=Prestataire de soins
 htmlformentry.scheduleAppointment.note=Note
diff --git a/api/src/main/resources/messages_ht.properties b/api/src/main/resources/messages_ht.properties
index 333b2b88c..60f3d1177 100644
--- a/api/src/main/resources/messages_ht.properties
+++ b/api/src/main/resources/messages_ht.properties
@@ -186,9 +186,7 @@ htmlformentry.scheduleAppointment.service=Sèvis
 htmlformentry.scheduleAppointment.appointmentType=Kalite randevou
 htmlformentry.scheduleAppointment.date=Dat
 htmlformentry.scheduleAppointment.appointmentTime=Lè
-htmlformentry.scheduleAppointment.timing=Orè
 htmlformentry.scheduleAppointment.allDay=Tout jounen an
-htmlformentry.scheduleAppointment.specificTime=Lè presi
 htmlformentry.scheduleAppointment.duration=Kantite tan (minit)
 htmlformentry.scheduleAppointment.provider=Moun ki bay swen
 htmlformentry.scheduleAppointment.note=Nòt
diff --git a/api/src/test/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElementTest.java b/api/src/test/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElementTest.java
index be62604d3..ce8375a2d 100644
--- a/api/src/test/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElementTest.java
+++ b/api/src/test/java/org/openmrs/module/htmlformentry/element/ScheduleAppointmentElementTest.java
@@ -14,7 +14,9 @@
 import static org.mockito.Mockito.when;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -104,10 +106,28 @@ public void setup() throws Exception {
 		mockedHtmlFormEntryUtil.when(() -> HtmlFormEntryUtil.getConcept(CONCEPT_ID)).thenReturn(concept);
 		mockedHtmlFormEntryUtil.when(() -> HtmlFormEntryUtil.createObs(any(Concept.class), any(), any(), any()))
 		        .thenCallRealMethod();
+		// real conversion logic per requested type, since different widgets request different types
+		// (DateWidget wants a Date, TimeWidget wants Integers) and a blanket canned value breaks whichever
+		// widget didn't ask for that type
 		mockedHtmlFormEntryUtil
 		        .when(() -> HtmlFormEntryUtil.getParameterAsType(any(HttpServletRequest.class), anyString(),
 		            any(Class.class)))
-		        .thenReturn(new java.util.Date());
+		        .thenAnswer(invocation -> {
+			        HttpServletRequest req = invocation.getArgument(0);
+			        String name = invocation.getArgument(1);
+			        Class<?> clazz = invocation.getArgument(2);
+			        String val = req.getParameter(name);
+			        if (val == null) {
+				        return null;
+			        }
+			        if (Date.class.isAssignableFrom(clazz)) {
+				        return new SimpleDateFormat("yyyy-MM-dd").parse(val);
+			        }
+			        if (Integer.class.isAssignableFrom(clazz)) {
+				        return Integer.valueOf(val);
+			        }
+			        return val;
+		        });
 
 		mockedContext.when(Context::getAdministrationService).thenReturn(administrationService);
 		mockedContext.when(Context::getMessageSourceService).thenReturn(messageSourceService);
@@ -240,7 +260,6 @@ private MockHttpServletRequest buildRequest() {
 
 		MockHttpServletRequest req = new MockHttpServletRequest();
 		req.addParameter("dd", AppointmentKind.Scheduled.name()); // all DropdownWidgets share "dd"; value must be a valid AppointmentKind for the type widget
-		req.addParameter("tf", "allday");             // allDayWidget → all-day, no time widget needed
 		req.addParameter("dt", "2025-01-15");         // date (parsed as yyyy-MM-dd by HtmlFormEntryUtil)
 		// prov_hid not set → provider = null (appointment is created without provider)
 		return req;