diff --git a/research/fraginternals.py b/research/fraginternals.py
index 66699c896..431b3ac55 100644
--- a/research/fraginternals.py
+++ b/research/fraginternals.py
@@ -956,9 +956,13 @@ class Authenticator(Daemon):
 	def handle_wpaspy(self, msg):
 		log(DEBUG, "daemon: " + msg)
 
-		if "AP-STA-NEW" in msg:
-			cmd, clientmac = msg.split()
+		# This is not called after deauth or reassociation
+		#if "AP-STA-NEW" in msg:
+			#cmd, clientmac = msg.split()
+		if "AP-STA-ASSOCIATING" in msg:
+			cmd, clientmac, source = msg.split()
 			self.add_station(clientmac)
+			log(ERROR, source)
 
 			log(STATUS, f"Client {clientmac} is connecting")
 			station = self.stations[clientmac]
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 38506a097..b663cf7a9 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -195,6 +195,11 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 	}
 	sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
 
+#ifdef CONFIG_TESTING_OPTIONS
+	wpa_msg(hapd->msg_ctx, MSG_INFO, "AP-STA-ASSOCIATING " MACSTR " hostapd_notif_assoc",
+		 MAC2STR(sta->addr));
+#endif /* CONFIG_TESTING_OPTIONS */
+
 	/*
 	 * ACL configurations to the drivers (implementing AP SME and ACL
 	 * offload) without hostapd's knowledge, can result in a disconnection
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 379a1239d..352e26fea 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -4376,6 +4376,11 @@ static void handle_assoc(struct hostapd_data *hapd,
 	}
 #endif /* CONFIG_FILS */
 
+#ifdef CONFIG_TESTING_OPTIONS
+	wpa_msg(hapd->msg_ctx, MSG_INFO, "AP-STA-ASSOCIATING " MACSTR " handle_assoc",
+		 MAC2STR(sta->addr));
+#endif /* CONFIG_TESTING_OPTIONS */
+
  fail:
 
 	/*
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index aa31bb38e..438e512ce 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -725,11 +725,6 @@ struct sta_info * ap_sta_add(struct hostapd_data *hapd, const u8 *addr)
 	sta->last_seq_ctrl = WLAN_INVALID_MGMT_SEQ;
 	dl_list_init(&sta->ip6addr);
 
-#ifdef CONFIG_TESTING_OPTIONS
-	wpa_msg(hapd->msg_ctx, MSG_INFO, "AP-STA-NEW " MACSTR,
-		 MAC2STR(sta->addr));
-#endif /* CONFIG_TESTING_OPTIONS */
-
 #ifdef CONFIG_TAXONOMY
 	sta_track_claim_taxonomy_info(hapd->iface, addr,
 				      &sta->probe_ie_taxonomy);