Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -rce0f73ee6ec5596888ce00ca6bcd94ee5c4f322d -rf0c8b8720a2e314268445a4a20fe701292026f6f
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision ce0f73ee6ec5596888ce00ca6bcd94ee5c4f322d)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision f0c8b8720a2e314268445a4a20fe701292026f6f)
@@ -61,6 +61,15 @@
         anchors.left        : parent.left
         anchors.leftMargin  : _root.leftMargin
 
+        TextEntry { id      : _ssid
+            nextInput       : _ipAddress // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
+            textInput.text  : vDevice.ssid
+            label.text      : qsTr("SSID")
+            textInput.width : entryWidth
+            label.width     : labelWidth
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
+        }
+
         TextEntry { id      : _ipAddress
             nextInput       : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vDevice.ipAddress
@@ -98,32 +107,9 @@
             label.width     : labelWidth
             label.text      : qsTr("DNS")
             hasCursor       : false // set false for now to disable the static IP entry for phase 1
-            validator       : ipValidator
         }
     }
 
-    Row { id : _ssidRow
-        anchors.top         : _ipColumn.bottom
-        anchors.topMargin   : 50
-        anchors.left        : parent.left
-        anchors.leftMargin  : _root.leftMargin
-        Text { id           : _ssidLabel
-            font.pixelSize  : Fonts.fontPixelTextRectExtra
-            color           : Colors.textMain
-            horizontalAlignment : TextInput.Alignleft
-            width           : labelWidth
-            text            : qsTr("SSID")
-        }
-
-        Text { id           : _ssidText
-            font.pixelSize  : Fonts.fontPixelTextRectExtra
-            color           : Colors.textMain
-            horizontalAlignment : TextInput.Alignleft
-            text            : ""
-            width           : entryWidth
-        }
-    }
-
     TouchRect { id          : _scanButton
         anchors.bottom      : parent.bottom
         anchors.bottomMargin: Variables.mainMenuHeight * 2 + Variables.minVGap
@@ -156,8 +142,7 @@
             readonly property bool   isConnected                : wifiConnected
             onIsConnectedChanged: {
                 if ( isConnected ) {
-                    _ssidText.text = wifiSsid
-                    vDevice.status = "WiFi Connected to " + wifiSsid
+                    vDevice.doInitWifiInfo()
                 }
             }
 
@@ -229,13 +214,4 @@
             }
         }
     }
-
-    Connections { target: vDevice
-        // slot to clear SSID when wifi list scan starts
-        function onWifiListEnabledChanged  ( vValue ) {
-            if (!vValue) {
-                _ssidText.text = ""
-            }
-        }
-    }
 }