Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r596b96528f155bd9f663ed1773fdc80761fc7b31 -rb53c3ab97a715ef9dc823a7148d0c0a52c413865
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision b53c3ab97a715ef9dc823a7148d0c0a52c413865)
@@ -360,11 +360,11 @@
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void )
 {
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
     VALVE_T valve;
 
-    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+    if (( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) && (STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH )))
     {
 #ifdef SKIP_UI_INTERACTION
         patientDisconnectionConfirmed = TRUE;