diff --git a/interface/src/project/EMSESPSettingsController.tsx b/interface/src/project/EMSESPSettingsController.tsx
index acb7249f9..306555cca 100644
--- a/interface/src/project/EMSESPSettingsController.tsx
+++ b/interface/src/project/EMSESPSettingsController.tsx
@@ -63,6 +63,19 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
                 onChange={handleValueChange('tx_mode')}
                 margin="normal"
             />
+            <SelectValidator name="ems_bus_id"
+                label="Bus ID"
+                value={data.ems_bus_id}
+                fullWidth
+                variant="outlined"
+                onChange={handleValueChange('ems_bus_id')}
+                margin="normal">
+                <MenuItem value={0x0B}>Service Key (0x0B)</MenuItem>
+                <MenuItem value={0x0D}>Modem (0x0D)</MenuItem>
+                <MenuItem value={0x0A}>Terminal (0x0A)</MenuItem>
+                <MenuItem value={0x0F}>Time Module (0x0F)</MenuItem>
+                <MenuItem value={0x12}>Alarm Module (0x12)</MenuItem>
+            </SelectValidator>
             <BlockFormControlLabel
                 control={
                     <Checkbox
diff --git a/src/EMSESPDevicesService.cpp b/src/EMSESPDevicesService.cpp
index 626bd0ef0..40896ae7d 100644
--- a/src/EMSESPDevicesService.cpp
+++ b/src/EMSESPDevicesService.cpp
@@ -22,6 +22,8 @@
 
 namespace emsesp {
 
+using namespace std::placeholders; // for `_1` etc
+
 EMSESPDevicesService::EMSESPDevicesService(AsyncWebServer * server, SecurityManager * securityManager)
     : _device_dataHandler(DEVICE_DATA_SERVICE_PATH,
                           securityManager->wrapCallback(std::bind(&EMSESPDevicesService::device_data, this, _1, _2), AuthenticationPredicates::IS_AUTHENTICATED)) {
@@ -39,7 +41,7 @@ EMSESPDevicesService::EMSESPDevicesService(AsyncWebServer * server, SecurityMana
 }
 
 void EMSESPDevicesService::scan_devices(AsyncWebServerRequest * request) {
-    EMSESP::send_read_request(EMSdevice::EMS_TYPE_UBADevices, EMSdevice::EMS_DEVICE_ID_BOILER);
+    EMSESP::scan_devices();
     request->send(200);
 }
 
@@ -55,7 +57,7 @@ void EMSESPDevicesService::all_devices(AsyncWebServerRequest * request) {
             obj["type"]      = emsdevice->device_type_name();
             obj["brand"]     = emsdevice->brand_to_string();
             obj["name"]      = emsdevice->name();
-            obj["deviceid"]  = emsdevice->device_id();
+            obj["deviceid"]  = emsdevice->get_device_id();
             obj["productid"] = emsdevice->product_id();
             obj["version"]   = emsdevice->version();
         }
diff --git a/src/EMSESPDevicesService.h b/src/EMSESPDevicesService.h
index b542e82fc..6d058dcd2 100644
--- a/src/EMSESPDevicesService.h
+++ b/src/EMSESPDevicesService.h
@@ -24,8 +24,7 @@
 #include <ESPAsyncWebServer.h>
 #include <SecurityManager.h>
 
-// #define MAX_EMSESP_STATUS_SIZE 1024
-#define MAX_EMSESP_DEVICE_SIZE 1280
+#define MAX_EMSESP_DEVICE_SIZE 1536
 
 #define EMSESP_DEVICES_SERVICE_PATH "/rest/allDevices"
 #define SCAN_DEVICES_SERVICE_PATH "/rest/scanDevices"
@@ -33,8 +32,6 @@
 
 namespace emsesp {
 
-using namespace std::placeholders; // for `_1`
-
 class EMSESPDevicesService {
   public:
     EMSESPDevicesService(AsyncWebServer * server, SecurityManager * securityManager);