Index: sources/gui/qml/pages/settings/SettingsDecommission.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f
--- sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f)
@@ -26,7 +26,7 @@
  *          which asks for confirmation of performing a factory reset and doing it if confirmed
  */
 UserConfirmation { id   : _root
-    message             : vDevice.decommissionEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+    message             : vDevice.decommissionEnabled ? qsTr("Do you want to perform the decommissioning?")
                                                       : qsTr("Please wait ...")
     itemIndex           : SettingsStack.Decommission
     notificationText    : vDevice.status
@@ -38,12 +38,12 @@
     backEnabled         : vDevice.decommissionEnabled
 
     onConfirmClicked    : {
-        _confirmDialog.titleText = _root.title
+        _confirmDialog.titleText = _headerBar.titleText
         _confirmDialog.open()
     }
     Connections { target: _confirmDialog
         function onAccepted() {
-            if ( _confirmDialog.titleText == _root.title ) { // use the title as the indication of what has been confirmed and if that is related to this function.
+            if ( currentItem === SettingsStack.Decommission ) {
                 vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
             }
         }