diff --git a/src/config/settings.h b/src/config/settings.h
index 92eba6df..e2c6aa26 100644
--- a/src/config/settings.h
+++ b/src/config/settings.h
@@ -139,7 +139,7 @@ typedef struct {
 typedef struct {
     char monitor_url[ZEXPORT_ADDR_LEN];
     char json_path[ZEXPORT_ADDR_LEN];
-    uint8_t query_device;   // 0 - Shelly, 1 - Tibber, 2 - other (rs232?)
+    uint8_t query_device;   // 0 - Tibber, 1 - Shelly, 2 - other (rs232?)
     uint8_t Iv;         // saves the inverter that is used for regulation
     bool enabled;
     float power_avg;
@@ -469,7 +469,7 @@ class settings {
             mCfg.plugin.zexport.count_avg = 10;
             mCfg.plugin.zexport.lastTime =  millis();   // do not change!
 
-            mCfg.plugin.zexport.query_device = 0;       // Standard shelly
+            mCfg.plugin.zexport.query_device = 1;       // Standard shelly
             mCfg.plugin.zexport.power_avg = 10;
             mCfg.plugin.zexport.Iv = 0;
             mCfg.plugin.zexport.max_power = 600;        // Max 600W to stay safe
diff --git a/src/web/html/setup.html b/src/web/html/setup.html
index 9cda0050..89d58e5c 100644
--- a/src/web/html/setup.html
+++ b/src/web/html/setup.html
@@ -324,10 +324,16 @@
 
                         <div class="row mb-3">
                             <div class="col-12 col-sm-3 my-2">Monitor IP: </div>
+                                <input type="radio" id="html" name="dev_Tibber" value="Tibber">
+                                <label for="html">Tibber</label>
+                                <input type="radio" id="css" name="dev_Shelly" value="Shelly">
+                                <label for="css">Shelly</label>
+                                <input type="radio" id="javascript" name="dev_Other" value="Other">
+                                <label for="javascript">Other</label>
 
-                            <div class="col-12 col-sm-9"><input type="text" name="monitor_url" maxlength="100">A JSON-Format is required to work properly.<br>
-                                HICHI:  http://IP_Address/cm?cmnd=status%208<br>
-                                Shelly: http://IP_Address/status</div>
+                            <div class="col-12 col-sm-9">
+                                <input type="text" name="monitor_url" maxlength="100">A JSON-Format is required to work properly.<br>
+                                HICHI:  http://IP_Address/cm?cmnd=status%208</div>
 
                             <div class="col-12 col-sm-3 my-2">Prio Inverter</div>
                             <div class="col-12 col-sm-9"><select name="iv" id="Inv_ID"></select>Which Inverter should be regulated.</div>
@@ -1195,9 +1201,14 @@
                 document.getElementsByName("en_zeroexport")[0].checked = obj["en_zeroexport"];
                 document.getElementsByName("two_percent")[0].checked = obj["two_percent"];
 
+                document.getElementsByName("dev_Tibber")[0].checked = (obj["query_device"] == 1);
+                document.getElementsByName("dev_Shelly")[0].checked = (obj["query_device"] == 2);
+                document.getElementsByName("dev_Other")[0].checked =  (obj["query_device"] == 3);
+
+
                 getAjax("/api/inverter/list", parseZeroIv);
 
-                for(var i of [["monitor_url", "monitor_url"], ["power_avg", "power_avg"], ["count_avg", "count_avg"], ["json_path", "json_path"], ["max_power", "max_power"], ["tibber_pw", "tibber_pw"]])
+                for(var i of [["monitor_url", "monitor_url"], ["power_avg", "power_avg"], ["count_avg", "count_avg"], ["json_path", "json_path"], ["max_power", "max_power"], ["query_device", "query_device"]])
                     if(null != obj[i[1]])
                         document.getElementsByName(i[0])[0].value = obj[i[1]];