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