diff --git a/include/Configuration.h b/include/Configuration.h
index a49cc7500..79d3e61c9 100644
--- a/include/Configuration.h
+++ b/include/Configuration.h
@@ -134,6 +134,7 @@ using PowerMeterHttpSmlConfig = struct POWERMETER_HTTP_SML_CONFIG_T;
 
 struct POWERLIMITER_INVERTER_CONFIG_T {
     uint64_t Serial;
+    bool IsGoverned;
     bool IsBehindPowerMeter;
     bool IsSolarPowered;
     bool UseOverscalingToCompensateShading;
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 6cc939fcb..a948a2c60 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -116,7 +116,7 @@ void ConfigurationClass::serializePowerLimiterConfig(PowerLimiterConfig const& s
     };
 
     // we want a representation of our floating-point value in the JSON that
-    // uses the least amount of decimal digits possble to convey the value that
+    // uses the least amount of decimal digits possible to convey the value that
     // is actually represented by the float. this is no easy task. ArduinoJson
     // does this for us, however, it does it as expected only for variables of
     // type double. this is probably because it assumes all floating-point
@@ -156,6 +156,7 @@ void ConfigurationClass::serializePowerLimiterConfig(PowerLimiterConfig const& s
         JsonObject t = inverters.add<JsonObject>();
 
         t["serial"] = serialStr(s.Serial);
+        t["is_governed"] = s.IsGoverned;
         t["is_behind_power_meter"] = s.IsBehindPowerMeter;
         t["is_solar_powered"] = s.IsSolarPowered;
         t["use_overscaling_to_compensate_shading"] = s.UseOverscalingToCompensateShading;
@@ -470,6 +471,7 @@ void ConfigurationClass::deserializePowerLimiterConfig(JsonObject const& source,
         JsonObject s = inverters[i];
 
         inv.Serial = serialBin(s["serial"] | String("0")); // 0 marks inverter slot as unused
+        inv.IsGoverned = s["is_governed"] | false;
         inv.IsBehindPowerMeter = s["is_behind_power_meter"] | POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER;
         inv.IsSolarPowered = s["is_solar_powered"] | POWERLIMITER_IS_INVERTER_SOLAR_POWERED;
         inv.UseOverscalingToCompensateShading = s["use_overscaling_to_compensate_shading"] | POWERLIMITER_USE_OVERSCALING_TO_COMPENSATE_SHADING;
@@ -741,6 +743,7 @@ bool ConfigurationClass::read()
         }
         inv.Serial = previousInverterSerial;
         config.PowerLimiter.InverterSerialForDcVoltage = previousInverterSerial;
+        inv.IsGoverned = true;
         inv.IsBehindPowerMeter = powerlimiter["is_inverter_behind_powermeter"] | POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER;
         inv.IsSolarPowered = powerlimiter["is_inverter_solar_powered"] | POWERLIMITER_IS_INVERTER_SOLAR_POWERED;
         inv.UseOverscalingToCompensateShading = powerlimiter["use_overscaling_to_compensate_shading"] | POWERLIMITER_USE_OVERSCALING_TO_COMPENSATE_SHADING;
diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp
index 88003ca54..59a156358 100644
--- a/src/PowerLimiter.cpp
+++ b/src/PowerLimiter.cpp
@@ -140,6 +140,8 @@ void PowerLimiterClass::loop()
 
         if (invConfig.Serial == 0ULL) { break; }
 
+        if (!invConfig.IsGoverned) { continue; }
+
         auto iter = _inverters.begin();
         while (iter != _inverters.end()) {
             if ((*iter)->getSerial() == invConfig.Serial) { break; }
@@ -160,7 +162,7 @@ void PowerLimiterClass::loop()
         for (size_t i = 0; i < INV_MAX_COUNT; ++i) {
             auto const& inv = config.PowerLimiter.Inverters[i];
             if (inv.Serial == 0ULL) { break; }
-            found = inv.Serial == (*iter)->getSerial();
+            found = inv.Serial == (*iter)->getSerial() && inv.IsGoverned;
             if (found) { break; }
         }
 
diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp
index 35b62f81f..0d8a5be8e 100644
--- a/src/WebApi_powerlimiter.cpp
+++ b/src/WebApi_powerlimiter.cpp
@@ -52,21 +52,20 @@ void WebApiPowerLimiterClass::onMetaData(AsyncWebServerRequest* request)
     root["battery_enabled"] = config.Battery.Enabled;
     root["charge_controller_enabled"] = config.Vedirect.Enabled;
 
-    JsonObject inverters = root["inverters"].to<JsonObject>();
+    JsonArray inverters = root["inverters"].to<JsonArray>();
     for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
         auto inv = Hoymiles.getInverterBySerial(config.Inverter[i].Serial);
         if (!inv) { continue; }
 
-        JsonObject obj = inverters[inv->serialString()].to<JsonObject>();
+        JsonObject obj = inverters.add<JsonObject>();
+        obj["serial"] = inv->serialString();
         obj["pos"] = i;
         obj["name"] = String(config.Inverter[i].Name);
         obj["poll_enable"] = config.Inverter[i].Poll_Enable;
         obj["poll_enable_night"] = config.Inverter[i].Poll_Enable_Night;
         obj["command_enable"] = config.Inverter[i].Command_Enable;
         obj["command_enable_night"] = config.Inverter[i].Command_Enable_Night;
-
-        obj["type"] = "Unknown";
-        obj["channels"] = 1;
+        obj["max_power"] = inv->DevInfo()->getMaxPower(); // okay if zero/unknown
         obj["type"] = inv->typeName();
         auto channels = inv->Statistics()->getChannelsByType(TYPE_DC);
         obj["channels"] = channels.size();
diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
index a4c5e6d7e..b0a89339f 100644
--- a/webapp/src/locales/de.json
+++ b/webapp/src/locales/de.json
@@ -664,6 +664,7 @@
         "ConfigHintNoBatteryInterface": "SoC-basierte Schwellwerte können nur mit konfigurierter Batteriekommunikationsschnittstelle genutzt werden.",
         "General": "Allgemein",
         "Enable": "Aktiviert",
+        "GovernInverter": "Steuere Wechselrichter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Aktiviere Solar-Passthrough",
diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
index 707313cf1..a798a9cfc 100644
--- a/webapp/src/locales/en.json
+++ b/webapp/src/locales/en.json
@@ -666,6 +666,7 @@
         "ConfigHintNoBatteryInterface": "SoC-based thresholds can only be used if a battery communication interface is configured.",
         "General": "General",
         "Enable": "Enable",
+        "GovernInverter": "Govern Inverter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Enable Solar-Passthrough",
diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
index b2c43dbc4..9a99f42e5 100644
--- a/webapp/src/locales/fr.json
+++ b/webapp/src/locales/fr.json
@@ -732,6 +732,7 @@
         "ConfigHintNoBatteryInterface": "SoC-based thresholds can only be used if a battery communication interface is configured.",
         "General": "General",
         "Enable": "Enable",
+        "GovernInverter": "Govern Inverter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Enable Solar-Passthrough",
diff --git a/webapp/src/types/PowerLimiterConfig.ts b/webapp/src/types/PowerLimiterConfig.ts
index 009604312..a2189ec50 100644
--- a/webapp/src/types/PowerLimiterConfig.ts
+++ b/webapp/src/types/PowerLimiterConfig.ts
@@ -1,10 +1,12 @@
 export interface PowerLimiterInverterInfo {
+    serial: string;
     pos: number;
     name: string;
     poll_enable: boolean;
     poll_enable_night: boolean;
     command_enable: boolean;
     command_enable_night: boolean;
+    max_power: number;
     type: string;
     channels: number;
 }
@@ -15,11 +17,12 @@ export interface PowerLimiterMetaData {
     power_meter_enabled: boolean;
     battery_enabled: boolean;
     charge_controller_enabled: boolean;
-    inverters: { [key: string]: PowerLimiterInverterInfo };
+    inverters: PowerLimiterInverterInfo[];
 }
 
 export interface PowerLimiterInverterConfig {
     serial: string;
+    is_governed: boolean;
     is_behind_power_meter: boolean;
     is_solar_powered: boolean;
     use_overscaling_to_compensate_shading: boolean;
diff --git a/webapp/src/views/PowerLimiterAdminView.vue b/webapp/src/views/PowerLimiterAdminView.vue
index 57ed9be6b..0803ad384 100644
--- a/webapp/src/views/PowerLimiterAdminView.vue
+++ b/webapp/src/views/PowerLimiterAdminView.vue
@@ -42,7 +42,18 @@
                     wide
                 />
 
-                <template v-if="isEnabled()">
+                <template v-if="powerLimiterConfigList.enabled">
+                    <InputElement
+                        v-for="(inv, idx) in powerLimiterConfigList.inverters"
+                        :key="idx"
+                        :label="$t('powerlimiteradmin.GovernInverter', { name: inverterName(inv.serial) })"
+                        v-model="powerLimiterConfigList.inverters[idx].is_governed"
+                        type="checkbox"
+                        wide
+                    />
+                </template>
+
+                <template v-if="isEnabled">
                     <InputElement
                         :label="$t('powerlimiteradmin.VerboseLogging')"
                         v-model="powerLimiterConfigList.verbose_logging"
@@ -51,7 +62,7 @@
                     />
 
                     <InputElement
-                        v-if="hasPowerMeter()"
+                        v-if="hasPowerMeter"
                         :label="$t('powerlimiteradmin.TargetPowerConsumption')"
                         :tooltip="$t('powerlimiteradmin.TargetPowerConsumptionHint')"
                         v-model="powerLimiterConfigList.target_power_consumption"
@@ -93,238 +104,199 @@
                 </template>
             </CardElement>
 
-            <CardElement
-                :text="$t('powerlimiteradmin.ManagedInverters')"
-                textVariant="text-bg-primary"
-                add-space
-                v-if="isEnabled()"
-            >
-                <div class="row mb-3" v-if="unmanagedInverters.length > 0">
-                    <label for="add_inverter" class="col-sm-4 col-form-label">
-                        {{ $t('powerlimiteradmin.AddInverter') }}
-                    </label>
-                    <div class="col-sm-7">
-                        <select id="add_inverter" class="form-select" v-model="additionalInverterSerial">
-                            <option v-for="serial in unmanagedInverters" :key="serial" :value="serial">
-                                {{ inverterLabel(serial) }}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="col-sm-1">
-                        <button type="button" class="btn btn-success w-100" @click="addInverter">
-                            <BIconDatabaseAdd />
-                        </button>
-                    </div>
-                </div>
-                <div class="table-responsive" v-if="powerLimiterConfigList.inverters.length > 0">
-                    <table class="table">
-                        <tbody>
-                            <tr>
-                                <th>{{ $t('powerlimiteradmin.InverterLabel') }}</th>
-                                <th>{{ $t('powerlimiteradmin.PowerSource') }}</th>
-                                <th>{{ $t('powerlimiteradmin.LowerPowerLimit') }}</th>
-                                <th>{{ $t('powerlimiteradmin.UpperPowerLimit') }}</th>
-                                <th></th>
-                            </tr>
-                            <tr v-for="inverter in powerLimiterConfigList.inverters" v-bind:key="inverter.serial">
-                                <td>{{ inverterLabel(inverter.serial) }}</td>
-                                <td v-if="inverter.is_solar_powered">
-                                    {{ $t('powerlimiteradmin.PowerSourceSolarPanels') }}
-                                </td>
-                                <td v-else>{{ $t('powerlimiteradmin.PowerSourceBattery') }}</td>
-                                <td>{{ inverter.lower_power_limit }}</td>
-                                <td>{{ inverter.upper_power_limit }}</td>
-                                <td>
-                                    <span
-                                        role="button"
-                                        class="text-danger"
-                                        @click="deleteStart(inverter)"
-                                        :title="$t('powerlimiteradmin.DeleteInverter')"
-                                    >
-                                        <BIconTrash /> </span
-                                    >&nbsp;
-                                    <span
-                                        role="button"
-                                        class="text-primary"
-                                        @click="editStart(inverter)"
-                                        :title="$t('powerlimiteradmin.EditInverter')"
-                                    >
-                                        <BIconPencil />
-                                    </span>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div v-else class="alert alert-warning" role="alert">
-                    {{ $t('powerlimiteradmin.NoManagedInverters') }}
-                </div>
-            </CardElement>
+            <template v-if="isEnabled">
+                <template v-for="(inv, idx) in powerLimiterConfigList.inverters" :key="idx">
+                    <CardElement
+                        v-if="inv.is_governed"
+                        :text="inverterLabel(inv.serial)"
+                        textVariant="text-bg-primary"
+                        add-space
+                    >
+                        <InputElement
+                            v-if="hasPowerMeter"
+                            :label="$t('powerlimiteradmin.InverterIsBehindPowerMeter')"
+                            v-model="powerLimiterConfigList.inverters[idx].is_behind_power_meter"
+                            :tooltip="$t('powerlimiteradmin.InverterIsBehindPowerMeterHint')"
+                            type="checkbox"
+                            wide
+                        />
+
+                        <InputElement
+                            :label="$t('powerlimiteradmin.InverterIsSolarPowered')"
+                            v-model="powerLimiterConfigList.inverters[idx].is_solar_powered"
+                            type="checkbox"
+                            wide
+                        />
+
+                        <InputElement
+                            v-if="powerLimiterConfigList.inverters[idx].is_solar_powered"
+                            :label="$t('powerlimiteradmin.UseOverscalingToCompensateShading')"
+                            :tooltip="$t('powerlimiteradmin.UseOverscalingToCompensateShadingHint')"
+                            v-model="powerLimiterConfigList.inverters[idx].use_overscaling_to_compensate_shading"
+                            type="checkbox"
+                            wide
+                        />
+
+                        <InputElement
+                            :label="$t('powerlimiteradmin.LowerPowerLimit')"
+                            :tooltip="$t('powerlimiteradmin.LowerPowerLimitHint')"
+                            v-model="powerLimiterConfigList.inverters[idx].lower_power_limit"
+                            postfix="W"
+                            type="number"
+                            wide
+                        />
+
+                        <InputElement
+                            :label="$t('powerlimiteradmin.UpperPowerLimit')"
+                            v-model="powerLimiterConfigList.inverters[idx].upper_power_limit"
+                            :tooltip="$t('powerlimiteradmin.UpperPowerLimitHint')"
+                            postfix="W"
+                            type="number"
+                            wide
+                        />
+                    </CardElement>
+                </template>
 
-            <CardElement
-                :text="$t('powerlimiteradmin.InverterSettings')"
-                textVariant="text-bg-primary"
-                add-space
-                v-if="isEnabled() && batteryPoweredInverterConfigured()"
-            >
-                <InputElement
-                    :label="$t('powerlimiteradmin.BatteryDischargeAtNight')"
-                    v-model="powerLimiterConfigList.battery_always_use_at_night"
-                    type="checkbox"
-                    wide
-                />
+                <CardElement
+                    :text="$t('powerlimiteradmin.InverterSettings')"
+                    textVariant="text-bg-primary"
+                    add-space
+                    v-if="governingBatteryPoweredInverters"
+                >
+                    <InputElement
+                        :label="$t('powerlimiteradmin.BatteryDischargeAtNight')"
+                        v-model="powerLimiterConfigList.battery_always_use_at_night"
+                        type="checkbox"
+                        wide
+                    />
 
-                <div class="row mb-3">
-                    <label for="inverter_serial_for_dc_voltage" class="col-sm-4 col-form-label">
-                        {{ $t('powerlimiteradmin.InverterForDcVoltage') }}
-                    </label>
-                    <div class="col-sm-8">
-                        <select
-                            id="inverter_serial_for_dc_voltage"
-                            class="form-select"
-                            v-model="powerLimiterConfigList.inverter_serial_for_dc_voltage"
-                            required
-                        >
-                            <option value="" disabled hidden selected>
-                                {{ $t('powerlimiteradmin.SelectInverter') }}
-                            </option>
-                            <option v-for="inv in batteryPoweredInverters" :key="inv.serial" :value="inv.serial">
-                                {{ inverterLabel(inv.serial) }}
-                            </option>
-                        </select>
+                    <div class="row mb-3">
+                        <label for="inverter_serial_for_dc_voltage" class="col-sm-4 col-form-label">
+                            {{ $t('powerlimiteradmin.InverterForDcVoltage') }}
+                        </label>
+                        <div class="col-sm-8">
+                            <select
+                                id="inverter_serial_for_dc_voltage"
+                                class="form-select"
+                                v-model="powerLimiterConfigList.inverter_serial_for_dc_voltage"
+                                required
+                            >
+                                <option value="" disabled hidden selected>
+                                    {{ $t('powerlimiteradmin.SelectInverter') }}
+                                </option>
+                                <option
+                                    v-for="inv in governedBatteryPoweredInverters"
+                                    :key="inv.serial"
+                                    :value="inv.serial"
+                                >
+                                    {{ inverterLabel(inv.serial) }}
+                                </option>
+                            </select>
+                        </div>
                     </div>
-                </div>
 
-                <div class="row mb-3" v-if="needsChannelSelection()">
-                    <label for="inverter_channel" class="col-sm-4 col-form-label">
-                        {{ $t('powerlimiteradmin.InverterChannelId') }}
-                    </label>
-                    <div class="col-sm-8">
-                        <select
-                            id="inverter_channel"
-                            class="form-select"
-                            v-model="powerLimiterConfigList.inverter_channel_id_for_dc_voltage"
-                        >
-                            <option
-                                v-for="channel in range(
-                                    powerLimiterMetaData.inverters[
-                                        powerLimiterConfigList.inverter_serial_for_dc_voltage
-                                    ].channels
-                                )"
-                                :key="channel"
-                                :value="channel"
+                    <div class="row mb-3" v-if="needsChannelSelection()">
+                        <label for="inverter_channel" class="col-sm-4 col-form-label">
+                            {{ $t('powerlimiteradmin.InverterChannelId') }}
+                        </label>
+                        <div class="col-sm-8">
+                            <select
+                                id="inverter_channel"
+                                class="form-select"
+                                v-model="powerLimiterConfigList.inverter_channel_id_for_dc_voltage"
                             >
-                                {{ channel + 1 }}
-                            </option>
-                        </select>
+                                <option
+                                    v-for="channel in range(
+                                        getInverterInfo(powerLimiterConfigList.inverter_serial_for_dc_voltage).channels
+                                    )"
+                                    :key="channel"
+                                    :value="channel"
+                                >
+                                    {{ channel + 1 }}
+                                </option>
+                            </select>
+                        </div>
                     </div>
-                </div>
 
-                <div class="row mb-3">
-                    <label for="inverter_restart" class="col-sm-4 col-form-label">
-                        {{ $t('powerlimiteradmin.InverterRestartHour') }}
-                        <BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterRestartHint')" />
-                    </label>
-                    <div class="col-sm-8">
-                        <select
-                            id="inverter_restart"
-                            class="form-select"
-                            v-model="powerLimiterConfigList.inverter_restart_hour"
-                        >
-                            <option value="-1">
-                                {{ $t('powerlimiteradmin.InverterRestartDisabled') }}
-                            </option>
-                            <option v-for="hour in range(24)" :key="hour" :value="hour">
-                                {{ hour > 9 ? hour : '0' + hour }}:00
-                            </option>
-                        </select>
+                    <div class="row mb-3">
+                        <label for="inverter_restart" class="col-sm-4 col-form-label">
+                            {{ $t('powerlimiteradmin.InverterRestartHour') }}
+                            <BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterRestartHint')" />
+                        </label>
+                        <div class="col-sm-8">
+                            <select
+                                id="inverter_restart"
+                                class="form-select"
+                                v-model="powerLimiterConfigList.inverter_restart_hour"
+                            >
+                                <option value="-1">
+                                    {{ $t('powerlimiteradmin.InverterRestartDisabled') }}
+                                </option>
+                                <option v-for="hour in range(24)" :key="hour" :value="hour">
+                                    {{ hour > 9 ? hour : '0' + hour }}:00
+                                </option>
+                            </select>
+                        </div>
                     </div>
-                </div>
-            </CardElement>
-
-            <CardElement
-                :text="$t('powerlimiteradmin.SolarPassthrough')"
-                textVariant="text-bg-primary"
-                add-space
-                v-if="canUseSolarPassthrough()"
-            >
-                <div
-                    class="alert alert-secondary"
-                    role="alert"
-                    v-html="$t('powerlimiteradmin.SolarpassthroughInfo')"
-                ></div>
-
-                <InputElement
-                    :label="$t('powerlimiteradmin.EnableSolarPassthrough')"
-                    v-model="powerLimiterConfigList.solar_passthrough_enabled"
-                    type="checkbox"
-                    wide
-                />
-
-                <template v-if="powerLimiterConfigList.solar_passthrough_enabled">
-                    <InputElement
-                        :label="$t('powerlimiteradmin.SolarPassthroughLosses')"
-                        v-model="powerLimiterConfigList.solar_passthrough_losses"
-                        placeholder="3"
-                        min="0"
-                        max="10"
-                        postfix="%"
-                        type="number"
-                        wide
-                    />
-
+                </CardElement>
+
+                <CardElement
+                    :text="$t('powerlimiteradmin.SolarPassthrough')"
+                    textVariant="text-bg-primary"
+                    add-space
+                    v-if="canUseSolarPassthrough"
+                >
                     <div
                         class="alert alert-secondary"
                         role="alert"
-                        v-html="$t('powerlimiteradmin.SolarPassthroughLossesInfo')"
+                        v-html="$t('powerlimiteradmin.SolarpassthroughInfo')"
                     ></div>
-                </template>
-            </CardElement>
-
-            <CardElement
-                :text="$t('powerlimiteradmin.VoltageThresholds')"
-                textVariant="text-bg-primary"
-                add-space
-                v-if="canUseVoltageThresholds()"
-            >
-                <InputElement
-                    :label="$t('powerlimiteradmin.IgnoreSoc')"
-                    :tooltip="$t('powerlimiteradmin.IgnoreSocHint')"
-                    v-model="powerLimiterConfigList.ignore_soc"
-                    type="checkbox"
-                    wide
-                />
 
-                <InputElement
-                    :label="$t('powerlimiteradmin.StartThreshold')"
-                    v-model="powerLimiterConfigList.voltage_start_threshold"
-                    placeholder="50"
-                    min="16"
-                    max="66"
-                    postfix="V"
-                    type="number"
-                    step="0.01"
-                    wide
-                />
+                    <InputElement
+                        :label="$t('powerlimiteradmin.EnableSolarPassthrough')"
+                        v-model="powerLimiterConfigList.solar_passthrough_enabled"
+                        type="checkbox"
+                        wide
+                    />
 
-                <InputElement
-                    :label="$t('powerlimiteradmin.StopThreshold')"
-                    v-model="powerLimiterConfigList.voltage_stop_threshold"
-                    placeholder="49"
-                    min="16"
-                    max="66"
-                    postfix="V"
-                    type="number"
-                    step="0.01"
-                    wide
-                />
+                    <template v-if="powerLimiterConfigList.solar_passthrough_enabled">
+                        <InputElement
+                            :label="$t('powerlimiteradmin.SolarPassthroughLosses')"
+                            v-model="powerLimiterConfigList.solar_passthrough_losses"
+                            placeholder="3"
+                            min="0"
+                            max="10"
+                            postfix="%"
+                            type="number"
+                            wide
+                        />
+
+                        <div
+                            class="alert alert-secondary"
+                            role="alert"
+                            v-html="$t('powerlimiteradmin.SolarPassthroughLossesInfo')"
+                        ></div>
+                    </template>
+                </CardElement>
+
+                <CardElement
+                    :text="$t('powerlimiteradmin.VoltageThresholds')"
+                    textVariant="text-bg-primary"
+                    add-space
+                    v-if="canUseVoltageThresholds"
+                >
+                    <InputElement
+                        :label="$t('powerlimiteradmin.IgnoreSoc')"
+                        :tooltip="$t('powerlimiteradmin.IgnoreSocHint')"
+                        v-model="powerLimiterConfigList.ignore_soc"
+                        type="checkbox"
+                        wide
+                    />
 
-                <template v-if="isSolarPassthroughEnabled()">
                     <InputElement
-                        :label="$t('powerlimiteradmin.FullSolarPassthroughStartThreshold')"
-                        :tooltip="$t('powerlimiteradmin.FullSolarPassthroughStartThresholdHint')"
-                        v-model="powerLimiterConfigList.full_solar_passthrough_start_voltage"
-                        placeholder="49"
+                        :label="$t('powerlimiteradmin.StartThreshold')"
+                        v-model="powerLimiterConfigList.voltage_start_threshold"
+                        placeholder="50"
                         min="16"
                         max="66"
                         postfix="V"
@@ -334,8 +306,8 @@
                     />
 
                     <InputElement
-                        :label="$t('powerlimiteradmin.VoltageSolarPassthroughStopThreshold')"
-                        v-model="powerLimiterConfigList.full_solar_passthrough_stop_voltage"
+                        :label="$t('powerlimiteradmin.StopThreshold')"
+                        v-model="powerLimiterConfigList.voltage_stop_threshold"
                         placeholder="49"
                         min="16"
                         max="66"
@@ -344,161 +316,103 @@
                         step="0.01"
                         wide
                     />
-                </template>
 
-                <InputElement
-                    :label="$t('powerlimiteradmin.VoltageLoadCorrectionFactor')"
-                    v-model="powerLimiterConfigList.voltage_load_correction_factor"
-                    placeholder="0.0001"
-                    postfix="1/A"
-                    type="number"
-                    step="0.0001"
-                    wide
-                />
+                    <template v-if="isSolarPassthroughEnabled">
+                        <InputElement
+                            :label="$t('powerlimiteradmin.FullSolarPassthroughStartThreshold')"
+                            :tooltip="$t('powerlimiteradmin.FullSolarPassthroughStartThresholdHint')"
+                            v-model="powerLimiterConfigList.full_solar_passthrough_start_voltage"
+                            placeholder="49"
+                            min="16"
+                            max="66"
+                            postfix="V"
+                            type="number"
+                            step="0.01"
+                            wide
+                        />
+
+                        <InputElement
+                            :label="$t('powerlimiteradmin.VoltageSolarPassthroughStopThreshold')"
+                            v-model="powerLimiterConfigList.full_solar_passthrough_stop_voltage"
+                            placeholder="49"
+                            min="16"
+                            max="66"
+                            postfix="V"
+                            type="number"
+                            step="0.01"
+                            wide
+                        />
+                    </template>
 
-                <div
-                    class="alert alert-secondary"
-                    role="alert"
-                    v-html="$t('powerlimiteradmin.VoltageLoadCorrectionInfo')"
-                ></div>
-            </CardElement>
+                    <InputElement
+                        :label="$t('powerlimiteradmin.VoltageLoadCorrectionFactor')"
+                        v-model="powerLimiterConfigList.voltage_load_correction_factor"
+                        placeholder="0.0001"
+                        postfix="1/A"
+                        type="number"
+                        step="0.0001"
+                        wide
+                    />
 
-            <CardElement
-                :text="$t('powerlimiteradmin.SocThresholds')"
-                textVariant="text-bg-primary"
-                add-space
-                v-if="canUseSoCThresholds()"
-            >
-                <InputElement
-                    :label="$t('powerlimiteradmin.StartThreshold')"
-                    v-model="powerLimiterConfigList.battery_soc_start_threshold"
-                    placeholder="80"
-                    min="0"
-                    max="100"
-                    postfix="%"
-                    type="number"
-                    wide
-                />
+                    <div
+                        class="alert alert-secondary"
+                        role="alert"
+                        v-html="$t('powerlimiteradmin.VoltageLoadCorrectionInfo')"
+                    ></div>
+                </CardElement>
+
+                <CardElement
+                    :text="$t('powerlimiteradmin.SocThresholds')"
+                    textVariant="text-bg-primary"
+                    add-space
+                    v-if="canUseSoCThresholds"
+                >
+                    <InputElement
+                        :label="$t('powerlimiteradmin.StartThreshold')"
+                        v-model="powerLimiterConfigList.battery_soc_start_threshold"
+                        placeholder="80"
+                        min="0"
+                        max="100"
+                        postfix="%"
+                        type="number"
+                        wide
+                    />
 
-                <InputElement
-                    :label="$t('powerlimiteradmin.StopThreshold')"
-                    v-model="powerLimiterConfigList.battery_soc_stop_threshold"
-                    placeholder="20"
-                    min="0"
-                    max="100"
-                    postfix="%"
-                    type="number"
-                    wide
-                />
+                    <InputElement
+                        :label="$t('powerlimiteradmin.StopThreshold')"
+                        v-model="powerLimiterConfigList.battery_soc_stop_threshold"
+                        placeholder="20"
+                        min="0"
+                        max="100"
+                        postfix="%"
+                        type="number"
+                        wide
+                    />
 
-                <InputElement
-                    :label="$t('powerlimiteradmin.FullSolarPassthroughStartThreshold')"
-                    :tooltip="$t('powerlimiteradmin.FullSolarPassthroughStartThresholdHint')"
-                    v-model="powerLimiterConfigList.full_solar_passthrough_soc"
-                    v-if="isSolarPassthroughEnabled()"
-                    placeholder="80"
-                    min="0"
-                    max="100"
-                    postfix="%"
-                    type="number"
-                    wide
-                />
+                    <InputElement
+                        :label="$t('powerlimiteradmin.FullSolarPassthroughStartThreshold')"
+                        :tooltip="$t('powerlimiteradmin.FullSolarPassthroughStartThresholdHint')"
+                        v-model="powerLimiterConfigList.full_solar_passthrough_soc"
+                        v-if="isSolarPassthroughEnabled"
+                        placeholder="80"
+                        min="0"
+                        max="100"
+                        postfix="%"
+                        type="number"
+                        wide
+                    />
 
-                <div class="alert alert-secondary" role="alert" v-html="$t('powerlimiteradmin.BatterySocInfo')"></div>
-            </CardElement>
+                    <div
+                        class="alert alert-secondary"
+                        role="alert"
+                        v-html="$t('powerlimiteradmin.BatterySocInfo')"
+                    ></div>
+                </CardElement>
+            </template>
 
-            <FormFooter @reload="getAllData" />
+            <FormFooter @reload="getMetaData" />
         </form>
     </BasePage>
-
-    <ModalDialog
-        modalId="inverterEdit"
-        :title="
-            unmanagedInverters.includes(editInverter.serial)
-                ? $t('powerlimiteradmin.AddInverter')
-                : $t('powerlimiteradmin.EditInverter')
-        "
-        :closeText="$t('powerlimiteradmin.Cancel')"
-    >
-        <div class="row mb-3">
-            <label for="inverter_label" class="col-sm-4 col-form-label">
-                {{ $t('powerlimiteradmin.EditInverterLabel') }}
-            </label>
-            <div class="col-sm-8 col-form-label">
-                {{ inverterLabel(editInverter.serial) }}
-            </div>
-        </div>
-
-        <InputElement
-            v-if="hasPowerMeter()"
-            :label="$t('powerlimiteradmin.InverterIsBehindPowerMeter')"
-            v-model="editInverter.is_behind_power_meter"
-            :tooltip="$t('powerlimiteradmin.InverterIsBehindPowerMeterHint')"
-            type="checkbox"
-            wide
-        />
-
-        <InputElement
-            :label="$t('powerlimiteradmin.InverterIsSolarPowered')"
-            v-model="editInverter.is_solar_powered"
-            type="checkbox"
-            wide
-        />
-
-        <InputElement
-            v-if="editInverter.is_solar_powered"
-            :label="$t('powerlimiteradmin.UseOverscalingToCompensateShading')"
-            :tooltip="$t('powerlimiteradmin.UseOverscalingToCompensateShadingHint')"
-            v-model="editInverter.use_overscaling_to_compensate_shading"
-            type="checkbox"
-            wide
-        />
-
-        <InputElement
-            :label="$t('powerlimiteradmin.LowerPowerLimit')"
-            :tooltip="$t('powerlimiteradmin.LowerPowerLimitHint')"
-            v-model="editInverter.lower_power_limit"
-            postfix="W"
-            type="number"
-            wide
-        />
-
-        <InputElement
-            :label="$t('powerlimiteradmin.UpperPowerLimit')"
-            v-model="editInverter.upper_power_limit"
-            :tooltip="$t('powerlimiteradmin.UpperPowerLimitHint')"
-            postfix="W"
-            type="number"
-            wide
-        />
-
-        <template #footer>
-            <button type="button" class="btn btn-primary" @click="editSubmit">
-                {{ $t('powerlimiteradmin.Apply') }}
-            </button>
-        </template>
-    </ModalDialog>
-
-    <ModalDialog
-        modalId="inverterDelete"
-        small
-        :title="$t('powerlimiteradmin.DeleteInverter')"
-        :closeText="$t('powerlimiteradmin.Cancel')"
-    >
-        <div>
-            {{
-                $t('powerlimiteradmin.DeleteInverterMsg', {
-                    serial: editInverter.serial,
-                    label: inverterLabel(editInverter.serial),
-                })
-            }}
-        </div>
-        <template #footer>
-            <button type="button" class="btn btn-danger" @click="deleteSubmit">
-                {{ $t('powerlimiteradmin.Delete') }}
-            </button>
-        </template>
-    </ModalDialog>
 </template>
 
 <script lang="ts">
@@ -509,10 +423,13 @@ import { handleResponse, authHeader } from '@/utils/authentication';
 import CardElement from '@/components/CardElement.vue';
 import FormFooter from '@/components/FormFooter.vue';
 import InputElement from '@/components/InputElement.vue';
-import ModalDialog from '@/components/ModalDialog.vue';
-import * as bootstrap from 'bootstrap';
-import { BIconInfoCircle, BIconDatabaseAdd, BIconTrash, BIconPencil } from 'bootstrap-icons-vue';
-import type { PowerLimiterConfig, PowerLimiterInverterConfig, PowerLimiterMetaData } from '@/types/PowerLimiterConfig';
+import { BIconInfoCircle } from 'bootstrap-icons-vue';
+import type {
+    PowerLimiterConfig,
+    PowerLimiterInverterConfig,
+    PowerLimiterMetaData,
+    PowerLimiterInverterInfo,
+} from '@/types/PowerLimiterConfig';
 
 export default defineComponent({
     components: {
@@ -522,10 +439,6 @@ export default defineComponent({
         FormFooter,
         InputElement,
         BIconInfoCircle,
-        BIconDatabaseAdd,
-        BIconTrash,
-        BIconPencil,
-        ModalDialog,
     },
     data() {
         return {
@@ -536,62 +449,69 @@ export default defineComponent({
             alertType: 'info',
             showAlert: false,
             configAlert: false,
-            additionalInverterSerial: '',
-            modalEdit: {} as bootstrap.Modal,
-            modalDelete: {} as bootstrap.Modal,
-            editInverter: {} as PowerLimiterInverterConfig,
         };
     },
-    mounted() {
-        this.modalEdit = new bootstrap.Modal('#inverterEdit');
-        this.modalDelete = new bootstrap.Modal('#inverterDelete');
-    },
     created() {
-        this.getAllData();
+        this.getMetaData();
     },
     watch: {
-        unmanagedInverters(newInverters) {
-            if (newInverters.includes(this.additionalInverterSerial)) {
-                return;
-            }
-            this.additionalInverterSerial = newInverters.length > 0 ? newInverters[0] : '';
-        },
-        'powerLimiterConfigList.inverter_serial_for_dc_voltage'(newValue) {
-            if (newValue === '') {
-                return; // do no inspect placeholder value
-            }
-
-            const managedInverters = this.powerLimiterConfigList.inverters;
-            if (!managedInverters) {
-                return [];
-            }
-
-            const managedSerials = managedInverters.map((inverter) => inverter.serial);
-            if (!managedSerials.includes(newValue)) {
+        governedInverters() {
+            if (
+                !this.governedInverters.some(
+                    (inv: PowerLimiterInverterConfig) =>
+                        inv.serial == this.powerLimiterConfigList.inverter_serial_for_dc_voltage
+                )
+            ) {
                 // marks serial as invalid, selects placeholder option
                 this.powerLimiterConfigList.inverter_serial_for_dc_voltage = '';
             }
         },
     },
     computed: {
-        unmanagedInverters() {
-            const managedInverters = this.powerLimiterConfigList.inverters;
-            if (!managedInverters) {
-                return [];
-            }
-
-            const managedSerials = managedInverters.map((inverter) => inverter.serial);
-            const res = Object.keys(this.powerLimiterMetaData.inverters).filter(
-                (serial) => !managedSerials.includes(serial)
+        governedInverters(): PowerLimiterInverterConfig[] {
+            const inverters = this.powerLimiterConfigList?.inverters || [];
+            return inverters.filter((inv: PowerLimiterInverterConfig) => inv.is_governed) || [];
+        },
+        governedBatteryPoweredInverters(): PowerLimiterInverterConfig[] {
+            return this.governedInverters.filter((inv: PowerLimiterInverterConfig) => !inv.is_solar_powered);
+        },
+        governingBatteryPoweredInverters(): boolean {
+            return this.governedBatteryPoweredInverters.length > 0;
+        },
+        isEnabled(): boolean {
+            const cfg = this.powerLimiterConfigList;
+            return cfg.enabled && this.governedInverters.length > 0;
+        },
+        isSolarPassthroughEnabled(): boolean {
+            return (
+                this.powerLimiterMetaData.charge_controller_enabled &&
+                this.powerLimiterConfigList.solar_passthrough_enabled
             );
-            return res;
         },
-        batteryPoweredInverters() {
-            return this.powerLimiterConfigList.inverters.filter((inverter) => !inverter.is_solar_powered);
+        hasPowerMeter(): boolean {
+            return this.powerLimiterMetaData.power_meter_enabled;
+        },
+        canUseSolarPassthrough(): boolean {
+            const meta = this.powerLimiterMetaData;
+            return meta.charge_controller_enabled && this.governingBatteryPoweredInverters;
+        },
+        canUseVoltageThresholds(): boolean {
+            return this.governingBatteryPoweredInverters;
+        },
+        canUseSoCThresholds(): boolean {
+            const cfg = this.powerLimiterConfigList;
+            const meta = this.powerLimiterMetaData;
+            return meta.battery_enabled && this.governingBatteryPoweredInverters && !cfg.ignore_soc;
         },
     },
     methods: {
-        getConfigHints() {
+        getInverterInfo(serial: string): PowerLimiterInverterInfo {
+            return (
+                this.powerLimiterMetaData.inverters?.find((inv: PowerLimiterInverterInfo) => inv.serial === serial) ||
+                ({} as PowerLimiterInverterInfo)
+            );
+        },
+        getConfigHints(): { severity: string; subject: string }[] {
             const meta = this.powerLimiterMetaData;
             const hints = [];
 
@@ -599,28 +519,26 @@ export default defineComponent({
                 hints.push({ severity: 'optional', subject: 'PowerMeterDisabled' });
             }
 
-            if (typeof meta.inverters === 'undefined' || Object.keys(meta.inverters).length == 0) {
+            if (typeof meta.inverters === 'undefined' || meta.inverters.length == 0) {
                 hints.push({ severity: 'requirement', subject: 'NoInverter' });
                 this.configAlert = true;
             } else {
-                const managedInverters = this.powerLimiterConfigList.inverters;
-                for (const managedInv of Object.values(managedInverters)) {
-                    const metaInverters = this.powerLimiterMetaData.inverters;
-                    const inv = metaInverters[managedInv.serial];
-                    if (!inv) {
-                        continue;
-                    }
+                for (const inv of this.powerLimiterMetaData.inverters) {
                     if (
-                        inv !== undefined &&
-                        !(inv.poll_enable && inv.command_enable && inv.poll_enable_night && inv.command_enable_night)
+                        !this.powerLimiterConfigList.inverters.some(
+                            (i: PowerLimiterInverterConfig) => i.serial == inv.serial
+                        )
                     ) {
+                        continue;
+                    }
+                    if (!(inv.poll_enable && inv.command_enable && inv.poll_enable_night && inv.command_enable_night)) {
                         hints.push({ severity: 'requirement', subject: 'InverterCommunication' });
                         break;
                     }
                 }
             }
 
-            if (this.batteryPoweredInverterConfigured()) {
+            if (this.governingBatteryPoweredInverters) {
                 if (!meta.charge_controller_enabled) {
                     hints.push({ severity: 'optional', subject: 'NoChargeController' });
                 }
@@ -632,32 +550,23 @@ export default defineComponent({
 
             return hints;
         },
-        isEnabled() {
-            return this.powerLimiterConfigList.enabled;
-        },
-        hasPowerMeter() {
-            return this.powerLimiterMetaData.power_meter_enabled;
-        },
-        canUseSolarPassthrough() {
-            const meta = this.powerLimiterMetaData;
-            return this.isEnabled() && meta.charge_controller_enabled && this.batteryPoweredInverterConfigured();
-        },
-        canUseSoCThresholds() {
-            const cfg = this.powerLimiterConfigList;
-            const meta = this.powerLimiterMetaData;
-            return (
-                this.isEnabled() && meta.battery_enabled && this.batteryPoweredInverterConfigured() && !cfg.ignore_soc
-            );
-        },
-        canUseVoltageThresholds() {
-            return this.isEnabled() && this.batteryPoweredInverterConfigured();
-        },
-        isSolarPassthroughEnabled() {
-            return this.powerLimiterConfigList.solar_passthrough_enabled;
-        },
         range(end: number) {
             return Array.from(Array(end).keys());
         },
+        inverterName(serial: string) {
+            if (serial === undefined) {
+                return 'undefined';
+            }
+            const meta = this.powerLimiterMetaData;
+            if (meta === undefined) {
+                return 'metadata pending';
+            }
+            const inv = this.getInverterInfo(serial);
+            if (inv === undefined) {
+                return 'not found';
+            }
+            return inv.name;
+        },
         inverterLabel(serial: string) {
             if (serial === undefined) {
                 return 'undefined';
@@ -666,25 +575,21 @@ export default defineComponent({
             if (meta === undefined) {
                 return 'metadata pending';
             }
-            const inv = meta.inverters[serial];
+            const inv = this.getInverterInfo(serial);
             if (inv === undefined) {
                 return 'not found';
             }
             return inv.name + ' (' + inv.type + ')';
         },
-        batteryPoweredInverterConfigured() {
-            return this.batteryPoweredInverters.length > 0;
-        },
         needsChannelSelection() {
             const cfg = this.powerLimiterConfigList;
-            const meta = this.powerLimiterMetaData;
 
             const reset = function () {
                 cfg.inverter_channel_id_for_dc_voltage = 0;
                 return false;
             };
 
-            if (!this.batteryPoweredInverterConfigured()) {
+            if (!this.governingBatteryPoweredInverters) {
                 return reset();
             }
 
@@ -692,79 +597,56 @@ export default defineComponent({
                 return reset();
             }
 
-            const inverter = meta.inverters[cfg.inverter_serial_for_dc_voltage];
-            if (inverter === undefined) {
-                return reset();
-            }
-
+            const inverter = this.getInverterInfo(cfg.inverter_serial_for_dc_voltage);
             if (cfg.inverter_channel_id_for_dc_voltage >= inverter.channels) {
                 cfg.inverter_channel_id_for_dc_voltage = 0;
             }
 
             return inverter.channels > 1;
         },
-        addInverter() {
-            const newInverter = {} as PowerLimiterInverterConfig;
-            newInverter.is_behind_power_meter = true;
-            newInverter.serial = this.additionalInverterSerial;
-            this.editStart(newInverter);
+        getMetaData() {
+            this.dataLoading = true;
+            fetch('/api/powerlimiter/metadata', { headers: authHeader() })
+                .then((response) => handleResponse(response, this.$emitter, this.$router))
+                .then((data) => {
+                    this.powerLimiterMetaData = data;
+                    this.getConfigData();
+                });
         },
-        editStart(inverter: PowerLimiterInverterConfig) {
-            this.editInverter = {} as PowerLimiterInverterConfig;
-            Object.assign(this.editInverter, inverter);
-            this.modalEdit.show();
+        getConfigData() {
+            fetch('/api/powerlimiter/config', { headers: authHeader() })
+                .then((response) => handleResponse(response, this.$emitter, this.$router))
+                .then((data) => {
+                    data.inverters = this.tidyUpInverterConfigs(data.inverters);
+                    this.powerLimiterConfigList = data;
+                    this.dataLoading = false;
+                });
         },
-        editSubmit() {
-            this.modalEdit.hide();
+        tidyUpInverterConfigs(inverters: PowerLimiterInverterConfig[]): PowerLimiterInverterConfig[] {
+            const metaInverters = this.powerLimiterMetaData?.inverters || [];
 
-            const cfg = this.powerLimiterConfigList;
+            // remove power limiter inverter config if no such inverter exists
+            inverters = inverters.filter((cfgInv: PowerLimiterInverterConfig) =>
+                metaInverters.some((metaInv) => metaInv.serial === cfgInv.serial)
+            );
 
-            let assigned = false;
-            for (const inverter of cfg.inverters) {
-                if (inverter.serial == this.editInverter.serial) {
-                    Object.assign(inverter, this.editInverter);
-                    assigned = true;
-                    break;
+            // add default power limiter inverter config for new inverters
+            for (const metaInv of metaInverters) {
+                const known = inverters.some((cfgInv: PowerLimiterInverterConfig) => cfgInv.serial === metaInv.serial);
+                if (known) {
+                    continue;
                 }
-            }
 
-            if (!assigned) {
-                cfg.inverters.push(JSON.parse(JSON.stringify(this.editInverter)));
-            }
-        },
-        deleteStart(inverter: PowerLimiterInverterConfig) {
-            Object.assign(this.editInverter, inverter);
-            this.modalDelete.show();
-        },
-        deleteSubmit() {
-            this.modalDelete.hide();
-            const cfg = this.powerLimiterConfigList;
-            for (let i = 0; i < cfg.inverters.length; i++) {
-                if (cfg.inverters[i].serial === this.editInverter.serial) {
-                    cfg.inverters.splice(i, 1);
-                    break;
-                }
+                const newInv = {} as PowerLimiterInverterConfig;
+                newInv.serial = metaInv.serial;
+                newInv.is_governed = false;
+                newInv.is_behind_power_meter = true;
+                newInv.lower_power_limit = 10 * metaInv.channels;
+                newInv.upper_power_limit = Math.max(metaInv.max_power, 300);
+                inverters.push(newInv);
             }
 
-            if (cfg.inverter_serial_for_dc_voltage === this.editInverter.serial) {
-                // previously selected inverter was deleted. marks serial as
-                // invalid, selects placeholder option.
-                cfg.inverter_serial_for_dc_voltage = '';
-            }
-        },
-        getAllData() {
-            this.dataLoading = true;
-            fetch('/api/powerlimiter/metadata', { headers: authHeader() })
-                .then((response) => handleResponse(response, this.$emitter, this.$router))
-                .then((data) => {
-                    this.powerLimiterMetaData = data;
-                    fetch('/api/powerlimiter/config', { headers: authHeader() })
-                        .then((response) => handleResponse(response, this.$emitter, this.$router))
-                        .then((data) => {
-                            this.powerLimiterConfigList = data;
-                            this.dataLoading = false;
-                        });
-                });
+            return inverters;
         },
         savePowerLimiterConfig(e: Event) {
             e.preventDefault();