Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rc73feffa73c7fe073a7a7581144f5806dfc91beb -rf0ffeb8c9ec7a838f039b904ce253b001561b5db
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision f0ffeb8c9ec7a838f039b904ce253b001561b5db)
@@ -105,7 +105,7 @@
         _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
-        serviceMode                             , // FactoryReset
+        _GuiView.manufactMode && serviceMode    , // FactoryReset
     ]
 
     SettingsHome { id   : _settingsHome
@@ -169,6 +169,10 @@
                 push( _settingsDeviceConfiguration )
                 break
 
+            case SettingsStack.FactoryReset:
+                push( _serviceFactoryReset )
+                break
+
             default:
                 console.debug("Unknown Index", vIndex)
                 break
@@ -187,6 +191,7 @@
     SettingsManufacturingSetup  { id: _settingsDeviceConfiguration  }
     SettingsDeviceRegistration  { id: _settingsDeviceRegistration   }
     SettingsServicePassword     { id: _servicePassword              }
+    SettingsFactoryReset        { id: _serviceFactoryReset          }
 
     function gotoServiceMode( vservice ) {
         if ( ! _servicePassword.isPassword_Accepted ) return