Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r8ee8ce1e868b66dd0ae197ef7a947e0436037ef3 -r9a61db88ccc5454001d4759e6ee5402695fda993
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 8ee8ce1e868b66dd0ae197ef7a947e0436037ef3)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 9a61db88ccc5454001d4759e6ee5402695fda993)
@@ -265,12 +265,8 @@
 
             Switch { id: _settingsRoInputSwitch
                 property bool active: true
-                onCheckedChanged: {
-                    if ( ! active ) active = true
-                    vSettings.roWaterMode = checked
-                }
 
-                checked : vSettings.roWaterMode
+                checked : vDuetRoWaterDG.status
 
                 width   : 85
                 height  : 85
@@ -305,11 +301,26 @@
                     color   : _settingsRoInputSwitch.active  ? Colors.textMain : Colors.textDisableButton
                     verticalAlignment       : Text.AlignTop
                     horizontalAlignment     : Text.AlignHCenter
-                    // anchors.bottom          : parent.top
-                    // anchors.verticalCenter  : parent.verticalCenter
                 }
             }
         }
+
+        Connections { target: _settingsRoInputSwitch
+            function onCheckedChanged() {
+                vDuetRoWaterDG.doAdjustment ( _settingsRoInputSwitch.checked )
+            }
+        }
+        Connections { target: vDuetRoWaterDG
+            function onAdjustmentTriggered(vValue) {
+                if ( vDuetRoWaterDG.adjustment_Accepted ) {
+                    _settingsRoInput.notificationText = ""
+                }
+                else {
+                    _settingsRoInput.notificationText = vDuetRoWaterDG.notification // adjustment_ReasonText
+                }
+                vSettings.roWaterMode = vDuetRoWaterDG.status
+            }
+        }
     }
 
     UserConfirmation            { id: _servicePassword