Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r9feea867113c62088f0ce91750127972dbd9bf53 -re5d1d67106a93a6cd1b5692b586625d715732e2f
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
@@ -263,9 +263,10 @@
 
     if ( STATE_CLOSED == getFPGADoorState() )
     {
-#ifndef SKIP_UI_INTERACTION
-        if ( TRUE == patientDisconnectionConfirmed )
+#ifdef SKIP_UI_INTERACTION
+        patientDisconnectionConfirmed = TRUE;
 #endif
+        if ( TRUE == patientDisconnectionConfirmed )
         {
             patientDisconnectionConfirmed = FALSE;
             state = HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE;
@@ -309,9 +310,10 @@
 
     if ( DRAIN_COMPLETE_STATE == currentDrainReservoirState )
     {
-#ifndef SKIP_UI_INTERACTION
-        if ( TRUE == disposableRemovalConfirmed )
+#ifdef SKIP_UI_INTERACTION
+        disposableRemovalConfirmed = TRUE;
 #endif
+        if ( TRUE == disposableRemovalConfirmed )
         {
             disposableRemovalConfirmed = FALSE;
             state = HD_POST_TREATMENT_VERIFY_STATE;