Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -raef40c25aa724a8fc249346de0cfc91bc63df8d4 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision aef40c25aa724a8fc249346de0cfc91bc63df8d4)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -7,7 +7,7 @@
  *
  * \file    SettingsWiFi.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      02-Feb-2023
+ * \date    (last)      03-Apr-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  06-May-2021
  *
@@ -28,7 +28,8 @@
  * \brief   SettingsWiFi
  *          The settings screen to setup the WiFi connection
  */
-SettingsBase { id: _root
+SettingsBase    { id: _root
+    itemIndex       : SettingsStack.WiFi
 
     property var ipValidator: RegExpValidator {
         regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/
@@ -53,7 +54,7 @@
     firstFocusInput : _ipAddress
     notificationText: vNetwork.status
     onConfirmClicked:  {
-        vDateTime.doConfirm(
+        vNetwork.doConfirm(
             _ipAddress  .textInput.text ,
             _gateway    .textInput.text ,
             _subnetmask .textInput.text ,
@@ -72,7 +73,7 @@
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
-            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
                 vNetwork.doSetIPAddress(textInput.text)
@@ -85,7 +86,7 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
-            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
                 vNetwork.doSetGateway(textInput.text)
@@ -98,7 +99,7 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
-            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
                 vNetwork.doSetSubnetMask(textInput.text)
@@ -110,7 +111,7 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
-            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
                 vNetwork.doSetDNS(textInput.text)
@@ -229,8 +230,8 @@
         title               : isPassword ? qsTr("Join") + separator + ssid + spaceSeparator + qsTr("Password") : qsTr("Disconnect") + separator + ssid
         onConfirmClicked    : {
             if ( isPassword ) {
-                if( password.length > 0 ) {
-                    vNetwork.doJoinNetwork      ( macAddress, password )
+                if( passwordCurrent.length > 0 ) {
+                    vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
                     pop()
                 }
             } else {