Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8747e947a7bc52dc3a4fb1346935740e08f5e974 -r0d9ab0530817e35acb17ad94985f9e099f91a90c
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8747e947a7bc52dc3a4fb1346935740e08f5e974)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0d9ab0530817e35acb17ad94985f9e099f91a90c)
@@ -447,7 +447,7 @@
 
     if ( HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE == currentPreTreatmentState )
     {
-        if ( PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE == currentPreTxPatConnState )
+        if ( currentPreTxPatConnState >= PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE )
         {
             patientConnectionConfirm = TRUE;
             accepted = TRUE;
@@ -1082,7 +1082,6 @@
     if ( ( TRUE == doorOpened ) && ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) )
     {
         doorClosedRequired( TRUE, TRUE );
-        doorOpened = FALSE;
         nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE;
     }
 
@@ -1104,7 +1103,6 @@
 
     if ( TRUE == patientConnectionConfirm )
     {
-        patientConnectionConfirm = FALSE;
         nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;
     }
 
@@ -1134,6 +1132,8 @@
     {
         DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
 
+        patientConnectionConfirm = FALSE;
+        doorOpened               = FALSE;
         setStartReservoirVolume( activeRes );
         requestNewOperationMode( MODE_TREA );
     }