diff --git a/tools/esp8266/web.cpp b/tools/esp8266/web.cpp
index 070bfcbb..535fac1f 100644
--- a/tools/esp8266/web.cpp
+++ b/tools/esp8266/web.cpp
@@ -16,6 +16,21 @@
 #include "html/h/setup_html.h"
 #include "html/h/visualization_html.h"
 
+
+const uint16_t pwrLimitOptionValues[] {
+    AbsolutNonPersistent,
+    AbsolutPersistent,
+    RelativNonPersistent,
+    RelativPersistent
+};
+
+const char* const pwrLimitOptions[] {
+    "absolute in Watt non persistent",
+    "absolute in Watt persistent",
+    "relativ in percent non persistent",
+    "relativ in percent persistent"
+};
+
 //-----------------------------------------------------------------------------
 web::web(app *main, sysConfig_t *sysCfg, config_t *config, char version[]) {
     mMain    = main;
@@ -200,21 +215,16 @@ void web::showSetup(void) {
         inv += F("\"/ maxlength=\"") + String(6) + "\">";
 
         inv += F("<label for=\"inv") + String(i) + F("ActivePowerLimitConType\">Active Power Limit Control Type</label>");
-        inv += F("<select name=\"inv") + String(i);
-        // UGLY! But I do not know it a better way
-        // ToDo: Need Cookies, IndexDB or PWA for that or in general client browser storage
-        if(NULL != iv){
-        if(iv->powerLimit[1] == AbsolutNonPersistent)
-            inv += F("PowerLimitControl\"><option value=\"0\">absolute in Watt non persistent</option><option value=\"1\">relativ in percent non persistent</option><option value=\"256\">absolute in Watt persistent</option><option value=\"257\">relativ in percent persistent</option></select>");
-        if(iv->powerLimit[1] == RelativNonPersistent)
-            inv += F("PowerLimitControl\"><option value=\"1\">relativ in percent non persistent</option><option value=\"0\">absolute in Watt non persistent</option><option value=\"256\">absolute in Watt persistent</option><option value=\"257\">relativ in percent persistent</option></select>");
-        if(iv->powerLimit[1] == AbsolutPersistent)
-            inv += F("PowerLimitControl\"><option value=\"256\">absolute in Watt persistent</option><option value=\"1\">relativ in percent non persistent</option><option value=\"0\">absolute in Watt non persistent</option><option value=\"257\">relativ in percent persistent</option></select>");
-        if(iv->powerLimit[1] == RelativPersistent)
-            inv += F("PowerLimitControl\"><option value=\"257\">relativ in percent persistent</option><option value=\"256\">absolute in Watt persistent</option><option value=\"1\">relativ in percent non persistent</option><option value=\"0\">absolute in Watt non persistent</option></select>");
-        } else
-            inv += F("PowerLimitControl\"><option value=\"0\">absolute in Watt non persistent</option><option value=\"1\">relativ in percent non persistent</option><option value=\"256\">absolute in Watt persistent</option><option value=\"257\">relativ in percent persistent</option></select>");
-        // UGLY! But I do not know it a better way --//
+        inv += F("<select name=\"inv") + String(i) + F("PowerLimitControl\">");
+        for(uint8_t j = 0; j < 4; j++) {
+            inv += F("<option value=\"") + String(pwrLimitOptionValues[j]) + F("\"");
+            if(NULL != iv) {
+                if(iv->powerLimit[1] == pwrLimitOptionValues[j])
+                    inv += F(" selected");
+            }
+            inv += F(">") + String(pwrLimitOptions[j]) + F("</option>");
+        }
+        inv += F("</select>");
         
         inv += F("<label for=\"inv") + String(i) + F("ModPwr0\" name=\"lbl") + String(i);
         inv += F("ModPwr\">Max Module Power (Wp)</label><div class=\"modpwr\">");