Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9feea867113c62088f0ce91750127972dbd9bf53 -re5d1d67106a93a6cd1b5692b586625d715732e2f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
@@ -328,9 +328,11 @@
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == patientConnectionConfirm )
+#ifdef SKIP_UI_INTERACTION
+    patientConnectionConfirm = TRUE;
 #endif
+
+    if ( TRUE == patientConnectionConfirm )
     {
         if ( ( MODE_PRET == getCurrentOperationMode() ) && ( HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE == currentPreTreatmentState ) )
         {
@@ -615,9 +617,11 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == confirmInstallRequested )
+#ifdef SKIP_UI_INTERACTION
+    confirmInstallRequested = TRUE;
 #endif
+
+    if ( TRUE == confirmInstallRequested )
     {
         confirmInstallRequested = FALSE;
         state = HD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
@@ -728,9 +732,11 @@
 
     execPreTreatmentRecirc();
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == continueToTreatmentRequested )
+#ifdef SKIP_UI_INTERACTION
+    continueToTreatmentRequested = TRUE;
 #endif
+
+    if ( TRUE == continueToTreatmentRequested )
     {
         continueToTreatmentRequested = FALSE;
         state = HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;