Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r6d4b788c840eeccb9ff603ce3195fd037fca7ede -ra9e71bdcefc289e2488368f47b1ba4795cd9e878
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision a9e71bdcefc289e2488368f47b1ba4795cd9e878)
@@ -53,62 +53,20 @@
         else                                                { vPage.reasonText = vDisinfectAdjustDisinfect.text()  }
     }
 
-    function disinfectsCalls(vIndex) {
-        let functionArray
-        if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) {
-            functionArray = [
-                    doDisinfectFlush     ,
-                    doDisinfectHeat      ,
-                    doDisinfectChemical  ,
-                    doDisinfectChemFlush ,
-                    doDisinfectROPermeate,
-                    ]
-        }
-        else {
-            functionArray = [
-                    doDisinfectFlush     ,
-                    doDisinfectHeat      ,
-                    doDisinfectROPermeate,
-                   ]
-        }
-
-        functionArray[vIndex]()
-    }
-
-    function disinfectsTexts() {
-        if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) {
-            return [
-                    _root.flushTitle     ,
-                    _root.heatTitle      ,
-                    _root.chemicalTitle  ,
-                    _root.chemFlushTitle ,
-                    _root.roPermeateTitle,
-                    ]
-        }
-        else {
-            return [
-                    _root.flushTitle     ,
-                    _root.heatTitle      ,
-                    _root.roPermeateTitle,
-                   ]
-        }
-    }
-
     DisinfectBase { id          :  _disinfectHome
         objectName              : "_disinfectHome"
         property int stackStepIndex : 0
         header.stepNames        : [ _root.disinfectTitle ]
         title.text              :   _root.disinfectTitle
 
         TouchGrid {
-            width       : parent.width / 2
-            colCount    : 1
-            colSpacing  : 0
-            // rowCount    : itemsText
-            itemsText   : disinfectsTexts()
-            onItemClicked: {
-                disinfectsCalls(vIndex)
-            }
+            property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect
+            width           : parent.width / 2
+            colCount        : 1
+            colSpacing      : 0
+            itemsText       : [ _root.flushTitle    , _root.heatTitle   , _root.chemicalTitle   , _root.chemFlushTitle  , _root.roPermeateTitle ,   ]
+            itemsVisible    : [ true                , true              , isVisible             , isVisible             , true                  ,   ]
+            onItemClicked   : [ doDisinfectFlush    , doDisinfectHeat   , doDisinfectChemical   , doDisinfectChemFlush  , doDisinfectROPermeate ,   ][vIndex]()
         }
         Image { id: _denaliDeviceImage
             anchors.right           : parent.right
Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h
===================================================================
diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -ra9e71bdcefc289e2488368f47b1ba4795cd9e878
--- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(.../MAdjustHDInstitutionalRecordResponse.h)	(revision 31f8f296fb58f57c121a39dfd7e78b11723479c6)
+++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(.../MAdjustHDInstitutionalRecordResponse.h)	(revision a9e71bdcefc289e2488368f47b1ba4795cd9e878)
@@ -32,36 +32,37 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0xB100| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
+ * |0xD000| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
  *
  * | Payload   ||
  * |           ||
- * | #1: (U32) | \ref Data::mMaxHepBolVolumeML            |
- * | #2: (U32) | \ref Data::mMinHepBolVolumeML            |
- * | #3: (U32) | \ref Data::mMaxHepDispRateMLPHR          |
- * | #4: (U32) | \ref Data::mMinHepDispRateMLPHR          |
- * | #5: (U32) | \ref Data::mMaxUltrafiltrationVolumeL    |
- * | #6: (U32) | \ref Data::mMinUltrafiltrationVolumeL    |
- * | #7: (U32) | \ref Data::mMaxVenAsymPressLimitMMHG     |
- * | #8: (U32) | \ref Data::mMinVenAsymPressLimitMMHG     |
- * | #9: (U32) | \ref Data::mMaxVenPressLimitWindowMMHG   |
- * | #10:(U32) | \ref Data::mMinVenPressLimitWindowMMHG   |
- * | #11:(U32) | \ref Data::mMaxArtPressLimitWindowMMHG   |
- * | #12:(U32) | \ref Data::mMinArtPressLimitWindowMMHG   |
- * | #13:(F32) | \ref Data::mMaxDialysateTempC            |
- * | #14:(F32) | \ref Data::mMinDialysateTempC            |
- * | #15:(S32) | \ref Data::mMaxSalineBolVolumeML         |
- * | #16:(S32) | \ref Data::mMinSalineBolVolumeML         |
- * | #17:(S32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN |
- * | #18:(S32) | \ref Data::mMinStopHepDispBeforeTxEndMIN |
- * | #19:(S32) | \ref Data::mMaxTxDurationMIN             |
- * | #20:(S32) | \ref Data::mMinTxDurationMIN             |
- * | #21:(F32) | \ref Data::mMaxDialysateFlowMLPM         |
- * | #22:(F32) | \ref Data::mMinDialysateFlowMLPM         |
- * | #23:(F32) | \ref Data::mMaxBloodFlowMLPM             |
- * | #24:(F32) | \ref Data::mMinBloodFlowMLPM             |
- * | #25:(F32) | \ref Data::mReason                       |
- * | #26:(F32) | \ref Data::mAccepted                     |
+ * | #1: (U32) | \ref Data::mAccepted                        |
+ * | #2: (U32) | \ref Data::mReason                          |
+ * | #3: (U32) | \ref Data::mMinBloodFlowMLPM                |
+ * | #4: (U32) | \ref Data::mMaxBloodFlowMLPM                |
+ * | #5: (U32) | \ref Data::mMinDialysateFlowMLPM            |
+ * | #6: (U32) | \ref Data::mMaxDialysateFlowMLPM            |
+ * | #7: (U32) | \ref Data::mMinTxDurationMIN                |
+ * | #8: (U32) | \ref Data::mMaxTxDurationMIN                |
+ * | #9: (U32) | \ref Data::mMinStopHepDispBeforeTxEndMIN    |
+ * | #10:(U32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN    |
+ * | #11:(U32) | \ref Data::mMinSalineBolVolumeML            |
+ * | #12:(U32) | \ref Data::mMaxSalineBolVolumeML            |
+ * | #13:(F32) | \ref Data::mMinDialysateTempC               |
+ * | #14:(F32) | \ref Data::mMaxDialysateTempC               |
+ * | #15:(S32) | \ref Data::mMinArtPressLimitWindowMMHG      |
+ * | #16:(S32) | \ref Data::mMaxArtPressLimitWindowMMHG      |
+ * | #17:(S32) | \ref Data::mMinVenPressLimitWindowMMHG      |
+ * | #18:(S32) | \ref Data::mMaxVenPressLimitWindowMMHG      |
+ * | #19:(S32) | \ref Data::mMinVenAsymPressLimitMMHG        |
+ * | #20:(S32) | \ref Data::mMaxVenAsymPressLimitMMHG        |
+ * | #21:(F32) | \ref Data::mMinUltrafiltrationVolumeL       |
+ * | #22:(F32) | \ref Data::mMaxUltrafiltrationVolumeL       |
+ * | #23:(F32) | \ref Data::mMinHepDispRateMLPHR             |
+ * | #24:(F32) | \ref Data::mMaxHepDispRateMLPHR             |
+ * | #25:(F32) | \ref Data::mMinHepBolVolumeML               |
+ * | #26:(F32) | \ref Data::mMaxHepBolVolumeML               |
+ * | #26:(U32) | \ref Data::mEnableChemicalDisinfect         |
  *
  * \sa Data
  *
Index: sources/view/settings/VAdjustmentInstitutionalRecord.h
===================================================================
diff -u -r6d4b788c840eeccb9ff603ce3195fd037fca7ede -ra9e71bdcefc289e2488368f47b1ba4795cd9e878
--- sources/view/settings/VAdjustmentInstitutionalRecord.h	(.../VAdjustmentInstitutionalRecord.h)	(revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede)
+++ sources/view/settings/VAdjustmentInstitutionalRecord.h	(.../VAdjustmentInstitutionalRecord.h)	(revision a9e71bdcefc289e2488368f47b1ba4795cd9e878)
@@ -103,7 +103,7 @@
     PROPERTY(float   ,   maxHepDispRateMLPM           , 0.0   )
     PROPERTY(float   ,   minHepBolVolumeML            , 0.0   )
     PROPERTY(float   ,   maxHepBolVolumeML            , 0.0   )
-    PROPERTY(quint32 ,   enableChemicalDisinfect      , 0     )
+    PROPERTY(bool    ,   enableChemicalDisinfect      , true  )
 
     PROPERTY(QStringList  , parametersTitle             , titles())
     PROPERTY(QStringList  , parametersText              , {}      )