Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r9a61db88ccc5454001d4759e6ee5402695fda993 -r559dc64d12cf7647ec8c29ccbf4ca90f90e5e3a2
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 9a61db88ccc5454001d4759e6ee5402695fda993)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 559dc64d12cf7647ec8c29ccbf4ca90f90e5e3a2)
@@ -7,7 +7,7 @@
  *
  * \file    SettingsStack.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      29-Mar-2023
+ * \date    (last)      03-Apr-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  16-Apr-2021
  *
@@ -41,18 +41,19 @@
     property bool   serviceMode : false
 
     enum ItemsIndex {
-        Information     ,
-        VolumeBrightness,
-        WiFi            ,
-        Bluetooth       ,
-        DGSettings      ,
-        Services        ,
-        SetDateTime     ,
-        ExportLogs      ,
-        RoInput         ,
-        Language        ,
-        Calibration     ,
-        SWUpdate        ,
+        Information         ,
+        VolumeBrightness    ,
+        WiFi                ,
+        Bluetooth           ,
+        DGSettings          ,
+        Services            ,
+        SetDateTime         ,
+        ExportLogs          ,
+        RoInput             ,
+        Language            ,
+        Calibration         ,
+        DeviceRegistration  ,
+        SWUpdate            ,
         FactoryReset
     }
     property var itemsText  : [
@@ -67,6 +68,7 @@
         qsTr("Water Input Mode"             ), // RoInput
         qsTr("Set Language"                 ), // Language
         qsTr("Calibration "                 ), // Calibration
+        qsTr("Device Registeration"         ), // DeviceRegistration
         qsTr("Software Update"              ), // SWUpdate
         qsTr("Factory Reset"                ), // FactoryReset
     ]
@@ -82,6 +84,7 @@
         true                                 , // RoInput
         false                                , // Language
         false                                , // Calibration
+        true                                 , // DeviceRegistration
         false                                , // SWUpdate
         false                                , // FactoryReset
     ]
@@ -97,6 +100,7 @@
         true                                 , // RoInput
         false /* serviceMode phase 1 */      , // Language
         false /* serviceMode phase 1 */      , // Calibration
+        true  /* serviceMode         */      , // DeviceRegistration // FIXME: On the normal setting menu for now for development.
         false /* serviceMode phase 1 */      , // SWUpdate
         false /* serviceMode phase 1 */      , // FactoryReset
     ]
@@ -154,6 +158,10 @@
                 push( _settingsRoInput )
                 break
 
+            case SettingsStack.DeviceRegistration:
+                push( _settingsDeviceRegistration )
+                break
+
             default:
                 console.debug("Unknown Index", vIndex)
                 break
@@ -323,6 +331,8 @@
         }
     }
 
+    SettingsDeviceRegistration  { id: _settingsDeviceRegistration }
+
     UserConfirmation            { id: _servicePassword
         property bool isPassword_Accepted   : false
         property bool isDefaultPasswordSet  : (vSettings.servicePass != "")