Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r9bf209fc5813b7e806f51f408ece77174a336c9b
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
@@ -125,6 +125,8 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
+    doorClosedRequired( FALSE, FALSE );
+
     cmdStopDGTrimmerHeater();
 
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -345,6 +347,7 @@
     {
         // Done with draining the reservoirs
         state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
+        doorClosedRequired( TRUE, TRUE );
     }
 
     return state;
@@ -368,14 +371,6 @@
     OPN_CLS_STATE_T frontDoor       = getSwitchStatus( FRONT_DOOR );
     OPN_CLS_STATE_T pumpTrack       = getSwitchStatus( PUMP_TRACK_SWITCH );
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-    {
-        frontDoor = STATE_CLOSED;
-        pumpTrack = STATE_CLOSED;
-    }
-#endif
-
     if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) )
     {
 #ifndef _RELEASE_
@@ -399,25 +394,15 @@
             homeDialInPump();
             homeDialOutPump();
 
+            doorClosedRequired( FALSE, FALSE );
+
             if ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) )
             {
                 retractSyringePump();
             }
         }
     }
-    else
-    {
-        if ( STATE_OPEN == frontDoor )
-        {
-            activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-        }
 
-        if ( STATE_OPEN == pumpTrack )
-        {
-            activateAlarmNoData( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
-        }
-    }
-
     return state;
 }