Index: sources/gui/qml/pages/settings/SettingsDecommission.qml
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r43866b80721c9f8945260d2c0b30a07555b02a42
--- sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision 43866b80721c9f8945260d2c0b30a07555b02a42)
@@ -43,7 +43,9 @@
     }
     Connections { target: _confirmDialog
         function onAccepted() {
-            vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            if ( _confirmDialog.titleText == _root.title ) { // use the title as the indication of what has been confirmed and if that is related to this function.
+                vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            }
         }
     }
 }
Index: sources/gui/qml/pages/settings/SettingsFactoryReset.qml
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r43866b80721c9f8945260d2c0b30a07555b02a42
--- sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision 43866b80721c9f8945260d2c0b30a07555b02a42)
@@ -43,7 +43,9 @@
     }
     Connections { target: _confirmDialog
         function onAccepted() {
-            vDevice.factoryReset = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            if ( _confirmDialog.titleText == _root.title ) { // use the title as the indication of what has been confirmed and if that is related to this function.
+                vDevice.factoryReset = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            }
         }
     }
 }
Index: sources/view/settings/VDuetRoWaterDG.h
===================================================================
diff -u -rd949be21f2a9badd0978dddaaf436f6805de28dc -r43866b80721c9f8945260d2c0b30a07555b02a42
--- sources/view/settings/VDuetRoWaterDG.h	(.../VDuetRoWaterDG.h)	(revision d949be21f2a9badd0978dddaaf436f6805de28dc)
+++ sources/view/settings/VDuetRoWaterDG.h	(.../VDuetRoWaterDG.h)	(revision 43866b80721c9f8945260d2c0b30a07555b02a42)
@@ -29,50 +29,47 @@
 /*!
  * \brief   The VTreatmentTime class
  * \details View for Model's data representation.
- *
  * \sa      Model::MTreatmentTime
+ * \startuml
+ *  actor       User  as US
+ *  participant UI    as UI
+ *  participant DG    as DG
+ *  participant FS    as FS
  *
- * \link    http://www.plantuml.com/
-   \startuml
-    actor       User  as US
-    participant UI    as UI
-    participant DG    as DG
-    participant FS    as FS
-
-    group POST
-      group UI POST
-        FS      -> UI : Water Mode Store
-        UI      -> UI : Update Settings
-        UI      -> DG : Water Mode Set [0xBC]
-        DG     --> UI : Water Mode Set [0xC4]
-      end
-      group DG POST
-        DG      -> UI : Water Mode Status [0xC3]
-        UI      -> DG : Water Mode Set [0xBC]
-        DG     --> UI : Water Mode Set [0xC4]
-      end
-      alt Accept
-        UI      -> US : Pass Notification [empty]
-      else Reject
-        UI      -> UI : Toggle Water Mode
-        UI      -> FS : Water Mode Store
-        UI      -> US : Fail Notification
-      end
-    end
-
-    group Settings
-        US      -> UI : "New" Water Mode [Toggled]
-        UI      -> DG : Water Mode Set [0xBC]
-        DG     --> UI : Water Mode Set [0xC4]
-        alt Accept
-          UI    -> FS : "New" Water Mode Store
-          UI    -> US : Pass Notification [empty]
-        else Reject
-          UI    -> UI : "Old" Water Mode [NonToggled]
-          UI    -> US : Fail Notification
-        end
-    end
-   \enduml
+ *  group POST
+ *    group UI POST
+ *      FS      -> UI : Water Mode Store
+ *      UI      -> UI : Update Settings
+ *      UI      -> DG : Water Mode Set [0xBC]
+ *      DG     --> UI : Water Mode Set [0xC4]
+ *    end
+ *    group DG POST
+ *      DG      -> UI : Water Mode Status [0xC3]
+ *      UI      -> DG : Water Mode Set [0xBC]
+ *      DG     --> UI : Water Mode Set [0xC4]
+ *    end
+ *    alt Accept
+ *      UI      -> US : Pass Notification [empty]
+ *    else Reject
+ *      UI      -> UI : Toggle Water Mode
+ *      UI      -> FS : Water Mode Store
+ *      UI      -> US : Fail Notification
+ *    end
+ *  end
+ *
+ *  group Settings
+ *      US      -> UI : "New" Water Mode [Toggled]
+ *      UI      -> DG : Water Mode Set [0xBC]
+ *      DG     --> UI : Water Mode Set [0xC4]
+ *      alt Accept
+ *        UI    -> FS : "New" Water Mode Store
+ *        UI    -> US : Pass Notification [empty]
+ *      else Reject
+ *        UI    -> UI : "Old" Water Mode [NonToggled]
+ *        UI    -> US : Fail Notification
+ *      end
+ *  end
+ * \enduml
  */
 class VDuetRoWaterDG : public VAdjustmentResponseBase
 {