Index: sources/gui/qml/pages/settings/SettingsDecommission.qml
===================================================================
diff -u -ra7693f04e693294338aa9829d14f4ed7aa99a7a5 -r46231564422493a69e3120459adefe1320eba255
--- sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision a7693f04e693294338aa9829d14f4ed7aa99a7a5)
+++ sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision 46231564422493a69e3120459adefe1320eba255)
@@ -26,25 +26,15 @@
  *          which asks for confirmation of performing a factory reset and doing it if confirmed
  */
 UserConfirmation{ id: _root
-    title               : qsTr("Device Decommissioning")
-    message             : vDevice.factoryResetEnabled ? qsTr("Do you want to perform a decommissioning of this device?")
-                                                      : qsTr("Decommissioning...")
+    message             : vDevice.decommissionEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+                                                      : qsTr("Please wait ...")
     itemIndex           : SettingsStack.Decommission
     notificationText    : vDevice.status
 
-    confirmVisible      :  true
+    confirmVisible      : true
     confirmEnabled      : vDevice.decommissionEnabled
     onConfirmClicked    : vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
 
     backVisible         : true
     backEnabled         : vDevice.decommissionEnabled
-    onBackClicked       : _root.notificationText = ""
-
-    Connections{ target:vDevice
-        function onAcceptedChanged() {
-            if(_root.visible) { // indicate reset screen is shown
-                _root.notificationText = vDevice.status
-            }
-        }
-    }
 }