Index: sources/gui/qml/pages/settings/SettingsFactoryReset.qml
===================================================================
diff -u -r364cf0959b78d4e86c7220fb878c5246c9d7d6bd -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision 364cf0959b78d4e86c7220fb878c5246c9d7d6bd)
+++ sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2023-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    SettingsFactoryReset.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      18-Jul-2023
+ * \date    (last)      28-Sep-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  18-Jul-2023
  *
@@ -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
+            }
         }
     }
 }