diff --git a/src/core/cntlr_map.c b/src/core/cntlr_map.c
index 6f78b7bfeb6fc73541b7d013768f9b505295a861..d61c47ccac59ef3021be0e228ac7bc35d755ae38 100644
--- a/src/core/cntlr_map.c
+++ b/src/core/cntlr_map.c
@@ -262,8 +262,8 @@ int handle_ap_autoconfig_search(void *cntlr, struct cmdu_buff *rx_cmdu)
 			} else {
 				char data[128] = {0};
 
-				snprintf(data, sizeof(data), "{\"type\":\"error\", \"reason\":\"multiple controllers\", \"almac\":\""MACFMT"\"}", MAC2STR(rx_cmdu->origin));
-				cntlr_notify_event(c, "map.controller", data);
+				snprintf(data, sizeof(data), "{\"type\":\"error\", \"reason\":\"multiple controllers\", \"data\": {\"remote_almac\":\""MACFMT"\"}}", MAC2STR(rx_cmdu->origin));
+				cntlr_notify_event(c, "wifi.controller", data);
 			}
 		}
 		break;
@@ -337,8 +337,8 @@ int handle_ap_autoconfig_response(void *cntlr, struct cmdu_buff *rx_cmdu)
 	} else {
 		char data[128] = {0};
 
-		snprintf(data, sizeof(data), "{\"type\":\"error\", \"reason\":\"multiple controllers\", \"almac\":\""MACFMT"\"}", MAC2STR(rx_cmdu->origin));
-		cntlr_notify_event(c, "map.controller", data);
+		snprintf(data, sizeof(data), "{\"type\":\"error\", \"reason\":\"multiple controllers\", \"data\": {\"remote_almac\":\""MACFMT"\"}}", MAC2STR(rx_cmdu->origin));
+		cntlr_notify_event(c, "wifi.controller", data);
 	}
 
 	return 0;