diff --git a/src/TaskEth.cpp b/src/TaskEth.cpp
index bfbab2e..55ee653 100644
--- a/src/TaskEth.cpp
+++ b/src/TaskEth.cpp
@@ -7,8 +7,26 @@
 
 volatile bool eth_connected = false;
 
-static void WiFiEvent(WiFiEvent_t event) {
+void WiFiEvent(WiFiEvent_t event) {
   switch (event) {
+  case SYSTEM_EVENT_STA_START:
+    logPrintlnI("WiFi Started");
+    break;
+  case SYSTEM_EVENT_STA_CONNECTED:
+    logPrintlnI("WiFi Connected");
+    break;
+  case SYSTEM_EVENT_STA_GOT_IP:
+    logPrintI("WiFi MAC: ");
+    logPrintI(WiFi.macAddress());
+    logPrintI(", IPv4: ");
+    logPrintlnI(WiFi.localIP().toString());
+    break;
+  case SYSTEM_EVENT_STA_DISCONNECTED:
+    logPrintlnW("WiFi Disconnected");
+    break;
+  case SYSTEM_EVENT_STA_STOP:
+    logPrintlnW("WiFi Stopped");
+    break;
   case SYSTEM_EVENT_ETH_START:
     logPrintlnI("ETH Started");
     ETH.setHostname("esp32-ethernet");
diff --git a/src/TaskEth.h b/src/TaskEth.h
index e4baefe..4a63d3f 100644
--- a/src/TaskEth.h
+++ b/src/TaskEth.h
@@ -3,6 +3,8 @@
 
 #include <TaskManager.h>
 
+void WiFiEvent(WiFiEvent_t event);
+
 class EthTask : public Task {
 public:
   EthTask();
diff --git a/src/TaskWifi.cpp b/src/TaskWifi.cpp
index 3c9365f..408a0fd 100644
--- a/src/TaskWifi.cpp
+++ b/src/TaskWifi.cpp
@@ -2,6 +2,7 @@
 #include <logger.h>
 
 #include "Task.h"
+#include "TaskEth.h"
 #include "TaskWifi.h"
 #include "project_configuration.h"
 
@@ -12,7 +13,7 @@ WifiTask::~WifiTask() {
 }
 
 bool WifiTask::setup(System &system) {
-  // WiFi.onEvent(WiFiEvent);
+  WiFi.onEvent(WiFiEvent);
   WiFi.setHostname(system.getUserConfig()->callsign.c_str());
   for (Configuration::Wifi::AP ap : system.getUserConfig()->wifi.APs) {
     logPrintD("Looking for AP: ");