Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8091f0c55008b0704793a533e38728fae1c7df9b -r39e2d7a0d208e1e79e4add6aad51035fac777c3e
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8091f0c55008b0704793a533e38728fae1c7df9b)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 39e2d7a0d208e1e79e4add6aad51035fac777c3e)
@@ -679,7 +679,7 @@
     patientConnectionConfirm = FALSE;
     treatmentStartRequested = FALSE;
 
-    doorClosedRequired( FALSE, TRUE );
+    doorClosedRequired( TRUE, TRUE );
 
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
@@ -1026,6 +1026,7 @@
     if ( TRUE == setUFVolStatus )
     {
         setUFVolStatus = FALSE;
+        doorClosedRequired( FALSE, TRUE );
         nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_DLZR_INVERT_STATE;
     }
 
@@ -1072,10 +1073,13 @@
     // Look for cartridge door to open and then close (indicating user inverted dialyzer)
     handlePatientConnectionDoorOpened();
 
-    if ( ( TRUE == patientConnectionConfirm ) && ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) )
+    if ( TRUE == patientConnectionConfirm )
     {
         doorClosedRequired( TRUE, TRUE );
-        nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;
+        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+        {
+            nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;
+        }
     }
 
     return nextState;