diff --git a/interface/src/framework/network/WiFiNetworkSelector.tsx b/interface/src/framework/network/WiFiNetworkSelector.tsx
index 7a1c0bec5..960289ef6 100644
--- a/interface/src/framework/network/WiFiNetworkSelector.tsx
+++ b/interface/src/framework/network/WiFiNetworkSelector.tsx
@@ -22,14 +22,15 @@ export const isNetworkOpen = ({ encryption_type }: WiFiNetwork) =>
 export const networkSecurityMode = ({ encryption_type }: WiFiNetwork) => {
   switch (encryption_type) {
     case WiFiEncryptionType.WIFI_AUTH_WEP:
-    case WiFiEncryptionType.WIFI_AUTH_WEP_PSK:
       return 'WEP';
-    case WiFiEncryptionType.WIFI_AUTH_WEP2_PSK:
-      return 'WEP2';
+    case WiFiEncryptionType.WIFI_AUTH_WPA_PSK:
+      return 'WPA';
+    case WiFiEncryptionType.WIFI_AUTH_WPA2_PSK:
+      return 'WPA2';
     case WiFiEncryptionType.WIFI_AUTH_WPA_WPA2_PSK:
-      return 'WPA/WEP2';
+      return 'WPA/WPA2';
     case WiFiEncryptionType.WIFI_AUTH_WPA2_ENTERPRISE:
-      return 'WEP2 Enterprise';
+      return 'WPA2 Enterprise';
     case WiFiEncryptionType.WIFI_AUTH_OPEN:
       return 'None';
     default:
diff --git a/interface/src/types/network.ts b/interface/src/types/network.ts
index cb12e57a0..538020903 100644
--- a/interface/src/types/network.ts
+++ b/interface/src/types/network.ts
@@ -12,8 +12,8 @@ export enum NetworkConnectionStatus {
 export enum WiFiEncryptionType {
   WIFI_AUTH_OPEN = 0,
   WIFI_AUTH_WEP = 1,
-  WIFI_AUTH_WEP_PSK = 2,
-  WIFI_AUTH_WEP2_PSK = 3,
+  WIFI_AUTH_WPA_PSK = 2,
+  WIFI_AUTH_WPA2_PSK = 3,
   WIFI_AUTH_WPA_WPA2_PSK = 4,
   WIFI_AUTH_WPA2_ENTERPRISE = 5
 }
diff --git a/src/command.cpp b/src/command.cpp
index 43d3d24b6..98d5b63b2 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -152,6 +152,8 @@ uint8_t Command::process(const char * path, const bool is_admin, const JsonObjec
     } else if (data.is<float>()) {
         char data_str[10];
         return_code = Command::call(device_type, command_p, Helpers::render_value(data_str, data.as<float>(), 2), is_admin, id_n, output);
+    } else if (data.is<bool>()) {
+        return_code = Command::call(device_type, command_p, data.as<bool>() ? "1" : "0", is_admin, id_n, output);
     } else if (data.isNull()) {
         return_code = Command::call(device_type, command_p, "", is_admin, id_n, output); // empty, will do a query instead
     } else {
diff --git a/src/locale_EN.h b/src/locale_EN.h
index 36b0ce7ba..677a3e104 100644
--- a/src/locale_EN.h
+++ b/src/locale_EN.h
@@ -489,23 +489,23 @@ MAKE_PSTR_LIST(auxElecHeatNrgConsHeating, F("auxelecheatnrgconsheating"), F("aux
 MAKE_PSTR_LIST(auxElecHeatNrgConsWW, F("auxelecheatnrgconsww"), F("auxiliary electrical heater energy consumption dhw"))
 MAKE_PSTR_LIST(auxElecHeatNrgConsPool, F("auxelecheatnrgconspool"), F("auxiliary electrical heater energy consumption pool"))
 
-MAKE_PSTR_LIST(hpPower, F("hppower"), F("Compressor power output"))
-MAKE_PSTR_LIST(hpCompOn, F("hpcompon"), F("HP Compressor"))
-MAKE_PSTR_LIST(hpHeatingOn, F("hpheatingon"), F("HP Heating"))
-MAKE_PSTR_LIST(hpCoolingOn, F("hpcoolingon"), F("HP Cooling"))
-MAKE_PSTR_LIST(hpWwOn, F("hpwwon"), F("HP dhw"))
-MAKE_PSTR_LIST(hpPoolOn, F("hppoolon"), F("HP Pool"))
-MAKE_PSTR_LIST(hpBrinePumpSpd, F("hpbrinepumpspd"), F("Brine Pump Speed"))
-MAKE_PSTR_LIST(hpCompSpd, F("hpcompspd"), F("Compressor Speed"))
-MAKE_PSTR_LIST(hpCircSpd, F("hpcircspd"), F("Circulation pump Speed"))
-MAKE_PSTR_LIST(hpBrineIn, F("hpbrinein"), F("Brine in/Evaporator"))
-MAKE_PSTR_LIST(hpBrineOut, F("hpbrineout"), F("Brine out/Condenser"))
-MAKE_PSTR_LIST(hpSuctionGas, F("hpsuctiongas"), F("Suction gas"))
-MAKE_PSTR_LIST(hpHotGas, F("hphotgas"), F("Hot gas/Compressed"))
-MAKE_PSTR_LIST(hpSwitchValve, F("hpswitchvalve"), F("Switch Valve"))
-MAKE_PSTR_LIST(hpActivity, F("hpactivity"), F("Compressor Activity"))
-MAKE_PSTR_LIST(hpTc0, F("hptc0"), F("Heat carrier return (TC0)"))
-MAKE_PSTR_LIST(hpTc1, F("hptc1"), F("Heat carrier forward (TC1)"))
+MAKE_PSTR_LIST(hpPower, F("hppower"), F("compressor power output"))
+MAKE_PSTR_LIST(hpCompOn, F("hpcompon"), F("hp compressor"))
+MAKE_PSTR_LIST(hpHeatingOn, F("hpheatingon"), F("hp heating"))
+MAKE_PSTR_LIST(hpCoolingOn, F("hpcoolingon"), F("hp cooling"))
+MAKE_PSTR_LIST(hpWwOn, F("hpwwon"), F("hp dhw"))
+MAKE_PSTR_LIST(hpPoolOn, F("hppoolon"), F("hp pool"))
+MAKE_PSTR_LIST(hpBrinePumpSpd, F("hpbrinepumpspd"), F("brine pump speed"))
+MAKE_PSTR_LIST(hpCompSpd, F("hpcompspd"), F("compressor speed"))
+MAKE_PSTR_LIST(hpCircSpd, F("hpcircspd"), F("circulation pump speed"))
+MAKE_PSTR_LIST(hpBrineIn, F("hpbrinein"), F("brine in/evaporator"))
+MAKE_PSTR_LIST(hpBrineOut, F("hpbrineout"), F("brine out/condenser"))
+MAKE_PSTR_LIST(hpSuctionGas, F("hpsuctiongas"), F("suction gas"))
+MAKE_PSTR_LIST(hpHotGas, F("hphotgas"), F("hot gas/compressed"))
+MAKE_PSTR_LIST(hpSwitchValve, F("hpswitchvalve"), F("switch valve"))
+MAKE_PSTR_LIST(hpActivity, F("hpactivity"), F("compressor activity"))
+MAKE_PSTR_LIST(hpTc0, F("hptc0"), F("heat carrier return (TC0)"))
+MAKE_PSTR_LIST(hpTc1, F("hptc1"), F("heat carrier forward (TC1)"))
 MAKE_PSTR_LIST(hpTc3, F("hptc3"), F("condenser temperature (TC3)"))
 MAKE_PSTR_LIST(hpTr3, F("hptr3"), F("refrigerant temperature liquid side (condenser output) (TR3)"))
 MAKE_PSTR_LIST(hpTr4, F("hptr4"), F("evaporator inlet temperature (TR4)"))