diff --git a/react/public/var/config.json b/react/public/var/config.json
index 2d62624..0e07f34 100644
--- a/react/public/var/config.json
+++ b/react/public/var/config.json
@@ -1,5 +1,5 @@
 {
-   "socket_server_port": 80,
+   "socket_server_port": 8080,
    "socket_server_address": "*",
    "debug": true,
     "max_upload_size": 1048576,
diff --git a/react/src/WifiConfigDialog.tsx b/react/src/WifiConfigDialog.tsx
index e073b01..db70664 100644
--- a/react/src/WifiConfigDialog.tsx
+++ b/react/src/WifiConfigDialog.tsx
@@ -194,6 +194,9 @@ const WifiConfigDialog = withStyles(styles, { withTheme: true })(
 
             wifiConfigSettings.enable = this.state.enabled;
             wifiConfigSettings.hotspotName = this.state.name;
+            wifiConfigSettings.countryCode = this.state.countryCode;
+            wifiConfigSettings.channel = this.state.channel;
+            
             if (this.state.newPassword.length === 0 || !this.state.enabled)
             {
                 wifiConfigSettings.hasPassword = false;
diff --git a/react/src/WifiConfigSettings.tsx b/react/src/WifiConfigSettings.tsx
index cc0cec8..b4f0c02 100644
--- a/react/src/WifiConfigSettings.tsx
+++ b/react/src/WifiConfigSettings.tsx
@@ -33,7 +33,7 @@ export default class WifiConfigSettings {
         return this;
     }
     clone() : WifiConfigSettings {
-        return this.deserialize(this);
+        return new WifiConfigSettings().deserialize(this);
     }
     valid: boolean =  true;
     wifiWarningGiven: boolean = false;
diff --git a/src/ShutdownMain.cpp b/src/ShutdownMain.cpp
index 4f52dce..e1dbf67 100644
--- a/src/ShutdownMain.cpp
+++ b/src/ShutdownMain.cpp
@@ -356,7 +356,7 @@ private:
                 governorMonitorThread.SetGovernor(governor);
                 result = 0;
             }
-            else if (command == "WifiConfigSettings ")
+            else if (command == "WifiConfigSettings")
             {
                 std::stringstream ss(args);
                 WifiConfigSettings settings;