Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r49b21798fb65ce44a04ae4e771ef7c3c1c119fa6 -ra7693f04e693294338aa9829d14f4ed7aa99a7a5
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 49b21798fb65ce44a04ae4e771ef7c3c1c119fa6)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision a7693f04e693294338aa9829d14f4ed7aa99a7a5)
@@ -108,8 +108,8 @@
         _GuiView.manufactMode && serviceMode    , // Device Configuration  // && serviceMode added to make sure the service mode is confirmed by HD
         _GuiView.manufactMode && serviceMode    , // DeviceRegistration    // && serviceMode added to make sure the service mode is confirmed by HD
         false /* serviceMode phase 1 */         , // SWUpdate
-        _GuiView.manufactMode && serviceMode    , // FactoryReset
-        _GuiView.manufactMode && serviceMode    , // Decommission
+        serviceMode                             , // FactoryReset
+        serviceMode                             , // Decommission
     ]
 
     SettingsHome { id   : _settingsHome