diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index c45769d..5a927c0 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -521,7 +521,7 @@ void setup() {
     Wire.endTransmission();
   }
 
-  if (analogRead(BATTERY_PIN) < 200) batterydetect = false; 
+  if (analogRead(BATTERY_PIN) < 200) batterydetect = false;
   SelectBand();
   ShowSignalLevel();
   ShowBW();
@@ -2598,18 +2598,17 @@ void showAF() {
     if (wifi) {
       Udp.beginPacket(remoteip, 9030);
       Udp.print("AF=");
-    }
-    for (byte af_scan = 0; af_scan < radio.af_counter; af_scan++) {
-      if (wifi) {
-        if ((radio.af[af_scan].frequency - 8750) / 10 < 0x10) {
-          Udp.print("0");
-        }
-        Udp.print((radio.af[af_scan].frequency - 8750) / 10, HEX);
-      }
-    }
-    af_counterold = radio.af_counter;
 
-    if (wifi) {
+      for (byte af_scan = 0; af_scan < radio.af_counter; af_scan++) {
+        if (wifi) {
+          if ((radio.af[af_scan].frequency - 8750) / 10 < 0x10) {
+            Udp.print("0");
+          }
+          Udp.print((radio.af[af_scan].frequency - 8750) / 10, HEX);
+        }
+      }
+      af_counterold = radio.af_counter;
+
       for (int i = 0; i < 25 - radio.af_counter; i++) Udp.print("00");
       Udp.endPacket();
     }
@@ -2618,6 +2617,86 @@ void showAF() {
 
 void showECC() {
   if (ECCold != radio.rds.ECC) {
+    String ECC;
+    if (radio.rds.picode[0] == '1') {
+      if (radio.rds.ECC == 224) ECC = "GER";
+      if (radio.rds.ECC == 225) ECC = "GR";
+      if (radio.rds.ECC == 226) ECC = "MA";
+      if (radio.rds.ECC == 228) ECC = "MD";
+    } else if (radio.rds.picode[0] == '2') {
+      if (radio.rds.ECC == 224) ECC = "ALG";
+      if (radio.rds.ECC == 225) ECC = "CYP";
+      if (radio.rds.ECC == 226) ECC = "CZE";
+      if (radio.rds.ECC == 227) ECC = "IE";
+      if (radio.rds.ECC == 228) ECC = "EE";
+    } else if (radio.rds.picode[0] == '3') {
+      if (radio.rds.ECC == 224) ECC = "AND";
+      if (radio.rds.ECC == 225) ECC = "SM";
+      if (radio.rds.ECC == 226) ECC = "PL";
+      if (radio.rds.ECC == 227) ECC = "TR";
+    } else if (radio.rds.picode[0] == '4') {
+      if (radio.rds.ECC == 224) ECC = "IL";
+      if (radio.rds.ECC == 225) ECC = "CH";
+      if (radio.rds.ECC == 226) ECC = "VA";
+      if (radio.rds.ECC == 227) ECC = "MK";
+    } else if (radio.rds.picode[0] == '5') {
+      if (radio.rds.ECC == 224) ECC = "IT";
+      if (radio.rds.ECC == 225) ECC = "JO";
+      if (radio.rds.ECC == 226) ECC = "SK";
+    } else if (radio.rds.picode[0] == '6') {
+      if (radio.rds.ECC == 224) ECC = "BEL";
+      if (radio.rds.ECC == 225) ECC = "FI";
+      if (radio.rds.ECC == 226) ECC = "SY";
+      if (radio.rds.ECC == 227) ECC = "YU";
+      if (radio.rds.ECC == 228) ECC = "UA";
+    } else if (radio.rds.picode[0] == '7') {
+      if (radio.rds.ECC == 224) ECC = "RU";
+      if (radio.rds.ECC == 225) ECC = "LU";
+      if (radio.rds.ECC == 226) ECC = "TN";
+    } else if (radio.rds.picode[0] == '8') {
+      if (radio.rds.ECC == 224) ECC = "AZR";
+      if (radio.rds.ECC == 225) ECC = "BUL";
+      if (radio.rds.ECC == 226) ECC = "PT";
+      if (radio.rds.ECC == 227) ECC = "NL";
+      if (radio.rds.ECC == 228) ECC = "PT";
+    } else if (radio.rds.picode[0] == '9') {
+      if (radio.rds.ECC == 224) ECC = "ALB";
+      if (radio.rds.ECC == 225) ECC = "DNK";
+      if (radio.rds.ECC == 226) ECC = "LI";
+      if (radio.rds.ECC == 227) ECC = "LV";
+      if (radio.rds.ECC == 228) ECC = "SI";
+    } else if (radio.rds.picode[0] == 'A') {
+      if (radio.rds.ECC == 224) ECC = "AUT";
+      if (radio.rds.ECC == 225) ECC = "GI";
+      if (radio.rds.ECC == 226) ECC = "IS";
+      if (radio.rds.ECC == 227) ECC = "LB";
+    } else if (radio.rds.picode[0] == 'B') {
+      if (radio.rds.ECC == 224) ECC = "HU";
+      if (radio.rds.ECC == 225) ECC = "IQ";
+      if (radio.rds.ECC == 226) ECC = "MC";
+    } else if (radio.rds.picode[0] == 'C') {
+      if (radio.rds.ECC == 224) ECC = "MT";
+      if (radio.rds.ECC == 225) ECC = "GB";
+      if (radio.rds.ECC == 226) ECC = "LT";
+      if (radio.rds.ECC == 227) ECC = "HRV";
+    } else if (radio.rds.picode[0] == 'D') {
+      if (radio.rds.ECC == 224) ECC = "DE";
+      if (radio.rds.ECC == 225) ECC = "LY";
+    } else if (radio.rds.picode[0] == 'E') {
+      if (radio.rds.ECC == 224) ECC = "CNR";
+      if (radio.rds.ECC == 225) ECC = "RO";
+      if (radio.rds.ECC == 226) ECC = "ES";
+      if (radio.rds.ECC == 227) ECC = "SE";
+    } else if (radio.rds.picode[0] == 'F') {
+      if (radio.rds.ECC == 224) ECC = "EG";
+      if (radio.rds.ECC == 225) ECC = "FR";
+      if (radio.rds.ECC == 226) ECC = "NO";
+      if (radio.rds.ECC == 227) ECC = "BLR";
+      if (radio.rds.ECC == 228) ECC = "BIH";
+    } else {
+      ECC = myLanguage[language][73];
+    }
+
     if (wifi) {
       Udp.beginPacket(remoteip, 9030);
       Udp.print("ECC=");
diff --git a/src/language.h b/src/language.h
index ec1d704..cdcb546 100644
--- a/src/language.h
+++ b/src/language.h
@@ -1,6 +1,6 @@
 // [number of languages][number of texts][max. length of text]
 
-static const char myLanguage[9][73][85] = {
+static const char myLanguage[9][74][85] = {
   { "English",                        // English
     "Rotary direction changed",
     "Please release button",
@@ -73,7 +73,8 @@ static const char myLanguage[9][73][85] = {
     "Invert display",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 
   { "Nederlands",                     // Dutch
@@ -148,7 +149,8 @@ static const char myLanguage[9][73][85] = {
     "Inverteer scherm",
     "Over deze software",
     "Basis code:",
-    "Bijgedragen:"
+    "Bijgedragen:",
+	"Onbekend"
   },
 
   { "Polski",                         // Polish
@@ -223,7 +225,8 @@ static const char myLanguage[9][73][85] = {
     "Display color invert",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 
   { "Hrvatski",                       // Croatian
@@ -298,7 +301,8 @@ static const char myLanguage[9][73][85] = {
     "Invertiraj boju zaslona",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 
   { "Ελληνικά",                       // Greek
@@ -373,7 +377,8 @@ static const char myLanguage[9][73][85] = {
     "Αναστροφή χρωμάτων οθόνης",
     "Πληροφορίες λογισμικού",
     "Κύριος κώδικας:",
-    "Συνεργάτες:"
+    "Συνεργάτες:",
+	"Unknown"
   },
 
   { "Romana",                         // Romanian
@@ -448,7 +453,8 @@ static const char myLanguage[9][73][85] = {
     "Display color invert",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 
   { "Deutsch",                        // German
@@ -523,7 +529,8 @@ static const char myLanguage[9][73][85] = {
     "Anzeigefarben umkehren",
     "Über diese Software",
     "Hauptcode:",
-    "Mitwirkende:"
+    "Mitwirkende:",
+	"Unknown"
   },
 
   { "Czech",                          // Czech
@@ -598,7 +605,8 @@ static const char myLanguage[9][73][85] = {
     "Display color invert",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 
   { "Slovak",                         // Slovak
@@ -673,6 +681,7 @@ static const char myLanguage[9][73][85] = {
     "Display color invert",
     "About software",
     "Main code:",
-    "Contributors:"
+    "Contributors:",
+	"Unknown"
   },
 };