diff --git a/freedata_gui/src/js/eventHandler.js b/freedata_gui/src/js/eventHandler.js
index 46df6b73..bcb5dc05 100644
--- a/freedata_gui/src/js/eventHandler.js
+++ b/freedata_gui/src/js/eventHandler.js
@@ -154,14 +154,14 @@ export function eventDispatcher(data) {
       return;
 
     case "message-logging":
-      if (data.endpoint === "wavelog") {
+      if (data.endpoint === "wavelog" || data.endpoint === "udp") {
         if (data.status === true) {
             const message = `
             <div>
-                <strong>${i18next.t('popups.wavelogposted')}:</strong>
-                <span class="badge bg-success">${i18next.t('popups.wavelogqsowith')}${data.message}${i18next.t('popups.wavelogqsoadded')}</span>
+                <strong>${i18next.t('popups.adiflog_header')}:</strong>
+                <span class="badge bg-success">${i18next.t('popups.adiflog_text1')}${data.message}${i18next.t('popups.adiflog_text2')}</span>
                 <div class="mt-2">
-                <span class="badge bg-secondary">${i18next.t('popups.wavelogposted')}</span>
+                <span class="badge bg-secondary">${data.endpoint} ${i18next.t('popups.adiflog_header')}</span>
                 </div>
             </div>
           `;
@@ -169,10 +169,10 @@ export function eventDispatcher(data) {
         } else {
             const message = `
             <div>
-                <strong>${i18next.t('popups.wavelogerror')}:</strong>
+                <strong>${i18next.t('popups.adiflog_header')}:</strong>
                 <span class="badge bg-danger">${data.message}</span>
                 <div class="mt-2">
-                <span class="badge bg-secondary">${i18next.t('popups.wavelogerror')}</span>
+                <span class="badge bg-secondary">${data.endpoint} ${i18next.t('popups.adiflog_error')}</span>
                 </div>
             </div>
                   `;
diff --git a/freedata_gui/src/locales/en_English.json b/freedata_gui/src/locales/en_English.json
index 7fe9ca2c..4d8717cc 100644
--- a/freedata_gui/src/locales/en_English.json
+++ b/freedata_gui/src/locales/en_English.json
@@ -34,10 +34,10 @@
         "transmissionfailedwith": "Transmission FAILED with",
         "confirmingtransmissionwith": "Confirming transmission with",
         "receivedbytes": "Received Bytes",
-        "wavelogposted": "Wavelog API",
-        "wavelogqsowith": "QSO with",
-        "wavelogqsoadded": "added to the log.",
-        "wavelogerror": "Wavelog failed"
+        "adiflog_header": "ADIF",
+        "adiflog_text1": "QSO with",
+        "adiflog_text2": "added to the log.",
+        "adiflog_error": "ADIF export error"
     },
     "navbar": {
         "frequency_help": "What's the frequency, Kenneth?",
diff --git a/freedata_gui/src/locales/no_Norsk.json b/freedata_gui/src/locales/no_Norsk.json
index e1ee520b..ba8be539 100644
--- a/freedata_gui/src/locales/no_Norsk.json
+++ b/freedata_gui/src/locales/no_Norsk.json
@@ -34,10 +34,10 @@
         "transmissionfailedwith": "Overføring MISLYKKET med",
         "confirmingtransmissionwith": "Bekrefter overføring med",
         "receivedbytes": "Mottatte bytes",
-        "wavelogposted": "Wavelog API",
-        "wavelogqsowith": "QSO med",
-        "wavelogqsoadded": "lagt til i loggen.",
-        "wavelogerror": "Wavelog feilet"
+        "adiflog_header": "ADIF",
+        "adiflog_text1": "QSO med",
+        "adiflog_text2": "lagt til i loggen.",
+        "adiflog_error": "ADIF export feilet"
     },
     "navbar": {
         "frequency_help": "Hva er frekvensen, Kenneth?",
diff --git a/freedata_server/adif_udp_logger.py b/freedata_server/adif_udp_logger.py
index 2a863834..a8a835cf 100644
--- a/freedata_server/adif_udp_logger.py
+++ b/freedata_server/adif_udp_logger.py
@@ -25,16 +25,23 @@ def send_adif_qso_data(config, event_manager, adif_data):
         sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         # Set a timeout of 3 seconds to avoid blocking indefinitely
         sock.settimeout(3)
+
+        callsign_start = adif_data.find(f">") + 1
+        callsign_end = adif_data.find(f"<QSO_DATE", callsign_start)
+        call_value = adif_data[callsign_start:callsign_end]
+
         try:
             sock.sendto(adif_data.encode('utf-8'), (adif_log_host, adif_log_port))
             log.info(f"[CHAT] ADIF QSO data sent to: {adif_log_host}:{adif_log_port}")
-            event_manager.freedata_logging(type="udp", status=True)
+            event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
+
         except socket.timeout:
             log.info(f"[CHAT] Timeout occurred sending ADIF data to {adif_log_host}:{adif_log_port}")
-            event_manager.freedata_logging(type="udp", status=False)
+            event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
         except Exception as e:
             log.info(f"[CHAT] Error sending ADIF data: {e}")
-            event_manager.freedata_logging(type="udp", status=False)
+            event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
+
         finally:
             sock.close()
 
diff --git a/freedata_server/wavelog_api_logger.py b/freedata_server/wavelog_api_logger.py
index 385b3338..80fe61af 100644
--- a/freedata_server/wavelog_api_logger.py
+++ b/freedata_server/wavelog_api_logger.py
@@ -52,7 +52,6 @@ def send_wavelog_qso_data(config, event_manager, wavelog_data):
             callsign_end = wavelog_data.find(f"<QSO_DATE", callsign_start)
             call_value = wavelog_data[callsign_start:callsign_end]
 
-#            event_manager.freedata_logging(type="wavelog", status=True, message=f"QSO with {call_value} added to log")
             event_manager.freedata_logging(type="wavelog", status=True, message=f" {call_value} ")
 
         except Exception as e: