Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision f723048b0efe2edf7cb08b9bba2ef67c55917503)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
@@ -170,8 +170,8 @@
  */
 void MessageInterpreter::printUnhandled(const Message &vMessage) const
 {
-    if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return.
     if ( gDisableUnhandledReport      ) return; // if the unhandled message error has been disabled, return.
+    if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return.
     QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits);
     QString logMessage = tr("Unhandled Message ID (HD)") + '\n' +
                          QString("%1 # %2 %3")
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
===================================================================
diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml	(.../PostTreatmentDisconnectStack.qml)	(revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml	(.../PostTreatmentDisconnectStack.qml)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
@@ -21,11 +21,17 @@
     }
 
     property int subStepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient
+    property int    stepIndex: PostTreatmentStack.Disconnect
 
     signal goToNextStep()
 
-    function initStack() { page ( _postTreatmentDisconnectPatient ) }
+    function setPage(vPage, vCondition) {
+        _root.subStepIndex = vPage.stepIndex
+        page( vPage , vCondition)
+    }
 
+    function initStack() { setPage ( _postTreatmentDisconnectPatient ) }
+
     function continueClicked() {
         switch ( _root.subStepIndex ) {
         case PostTreatmentDisconnectStack.Step.DisconnectPatient:
@@ -44,7 +50,7 @@
         case PostTreatmentDisconnectStack.Step.DisconnectPatient:
             break
         case PostTreatmentDisconnectStack.Step.DrainConsumable:
-            page ( _postTreatmentDisconnectPatient )
+            setPage ( _postTreatmentDisconnectPatient )
             break
         default:
             break
@@ -56,22 +62,15 @@
     }
 
     // ----- Screens definitions
-    PostTreatmentBase { id: _postTreatmentDisconnectPatient
-        instructionBased    : true
-        subStepName         : qsTr("Disconnect Patient BloodLines")
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DisconnectPatient ; updateModel()   }
-    }
+    PostTreatmentBase               { id: _postTreatmentDisconnectPatient; stepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient; subStepName: qsTr("Disconnect Patient BloodLines"); instructionBased: true}
+    PostTreatmentDrainConsumables   { id: _postTreatmentDrainConsumables;  stepIndex: PostTreatmentDisconnectStack.Step.DrainConsumable;                            }
 
-    PostTreatmentDrainConsumables { id: _postTreatmentDrainConsumables
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DrainConsumable                     }
-    }
-
     // Confirm Patient Disconnection
     Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
         function onAdjustmentTriggered          ( vValue ) {
             if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
                 _postTreatmentDisconnectPatient.reasonText = ""
-                page ( _postTreatmentDrainConsumables )
+                setPage ( _postTreatmentDrainConsumables )
             } else {
                 _postTreatmentDisconnectPatient.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
             }
@@ -81,6 +80,7 @@
     onVisibleChanged: {
         if (visible) {
             _headerBar.activeStack = stackView
+            initStack()
         }
         else {
             stackView.initialItem = null
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -rd82802819678ccdb5d2cf480cf06071c4b4b4197 -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision d82802819678ccdb5d2cf480cf06071c4b4b4197)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
@@ -156,10 +156,10 @@
         onConfirmClicked: _root.confirmClicked()
     }
 
-    PostTreatmentBase   { id: _patientDisconnectionConfirm; stepIndex: PostTreatmentStack.Disconnect;   instructionBased: true  }
-    PostTreatmentBase   { id: _postTreatmentRemove;         stepIndex: PostTreatmentStack.Remove;       instructionBased: true  }
-    PostTreatmentReview { id: _postTreatmentReview;         stepIndex: PostTreatmentStack.Review                                }
-    PostTreatmentBase   { id: _postTreatmentDisinfection;   stepIndex: PostTreatmentStack.Disinfection                          }
+    PostTreatmentDisconnectStack   { id: _postTreatmentDisconnectStack; stepIndex: PostTreatmentStack.Disconnect                            }
+    PostTreatmentBase               { id: _postTreatmentRemove;         stepIndex: PostTreatmentStack.Remove;       instructionBased: true  }
+    PostTreatmentReview             { id: _postTreatmentReview;         stepIndex: PostTreatmentStack.Review                                }
+    PostTreatmentBase               { id: _postTreatmentDisinfection;   stepIndex: PostTreatmentStack.Disinfection                          }
 
     // connections
     Connections { target: vPostTreatmentStates
@@ -170,12 +170,12 @@
     }
 
     Connections { target: vTDOpMode
-        function onPostTreatmentChanged         ( vValue ) { setPage( _patientDisconnectionConfirm  , vValue   )}
+        function onPostTreatmentChanged         ( vValue ) { setPage( _postTreatmentDisconnectStack  , vValue   )}
     }
 
     // Disconnect stack
     Connections { target: _postTreatmentDisconnectStack
-        function onGoToNextStep ()      { page ( _postTreatmentRemove       )}
+        function onGoToNextStep ()      { setPage ( _postTreatmentRemove       )}
     }
 
     // Auto - Eject
Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
===================================================================
diff -u -r810c7a5420afe2e11b25d1c85543358d038cbd2d -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3
--- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 810c7a5420afe2e11b25d1c85543358d038cbd2d)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
@@ -25,13 +25,6 @@
     property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing
     property int    stepIndex: PreTreatmentStack.Step.Installation
 
-    onVisibleChanged: {
-        if (visible) {
-            _headerBar.activeStack = stackView
-            initStack()
-        }
-    }
-
     signal goToNextStep()
     signal goToPreviousStep()
 
@@ -115,4 +108,11 @@
             }
         }
     }
+
+    onVisibleChanged: {
+        if (visible) {
+            _headerBar.activeStack = stackView
+            initStack()
+        }
+    }
 }