Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r87d315ee2269056a9ca4a023597e7a8dff7db90b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 87d315ee2269056a9ca4a023597e7a8dff7db90b)
@@ -1014,24 +1014,27 @@
  *************************************************************************/
 BOOL verifyTreatmentDurationSettingChange( U32 treatmentTime )
 {
-    BOOL result = FALSE;
+    BOOL result                               = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejectReason = REQUEST_REJECT_REASON_NONE;
-    HD_OP_MODE_T currMode = getCurrentOperationMode();
+    HD_OP_MODE_T currMode                     = getCurrentOperationMode();
 
     // Check if we are in an appropriate treatment state for settings adjustment
     if ( ( MODE_TREA == currMode ) &&
          ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_END_STATE ) &&
          ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= getMinTreatmentTimeInMinutes() ) )
     {
-        F32 uFVolume;
-        U32 dialVolume = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) * treatmentTime;   // In mL
-
         // Always adjust UF volume to accommodate treatment time change (not UF rate)
-        uFVolume = ( (F32)( treatmentTime - CALC_ELAPSED_TREAT_TIME_IN_MIN() ) * presUFRate ) + getUltrafiltrationReferenceVolume();
-        if ( ( treatmentTime >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
-             ( treatmentTime <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
-             ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) &&
-             ( uFVolume <= MAX_UF_VOLUME_ML ) )
+        F32 uFVolume          = ( (F32)( treatmentTime - CALC_ELAPSED_TREAT_TIME_IN_MIN() ) * presUFRate ) + getUltrafiltrationReferenceVolume();
+        U32 dialVolume        = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) * treatmentTime;   // In mL
+        // The minimum treatment time is either in the range of the institutional record or the 1-minute treatment config has been requested which is an exception
+        BOOL isMinTxTimeValid = ( ( treatmentTime >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) ||
+                                  ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_ONE_MINUTE_TREATMENT ) ) ? TRUE : FALSE );
+        BOOL isTxTimeValid    = ( ( TRUE == isMinTxTimeValid ) &&
+                                  ( treatmentTime <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) ? TRUE : FALSE );
+        BOOL isMinUFVolValid  = ( ( uFVolume >= getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_UF_VOLUME ) ) || ( uFVolume <= 0.0F ) ? TRUE : FALSE );
+        BOOL isUFVolValid     = ( ( TRUE == isMinUFVolValid ) && ( uFVolume <= getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_UF_VOLUME ) ) ? TRUE : FALSE );
+
+        if ( ( TRUE == isTxTimeValid ) && ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) && ( TRUE == isUFVolValid ) )
         {
             result = TRUE;
             sendTreatmentLogEventData( TREATMENT_DURATION_CHANGE_EVENT, ( presTreatmentTimeSecs / SEC_PER_MIN ), treatmentTime );
@@ -1044,12 +1047,11 @@
         }
         else
         {
-            if ( ( treatmentTime < getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) ||
-                 ( treatmentTime > getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) )
+            if ( FALSE == isTxTimeValid )
             {
                 rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE;
             }
-            else if ( uFVolume > MAX_UF_VOLUME_ML )
+            else if ( FALSE == isUFVolValid )
             {
                 rejectReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
             }