diff --git a/map-agent/Config.in b/map-agent/Config.in
index a31aed3aa..98e2c0e27 100644
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -33,5 +33,8 @@ config AGENT_EASYMESH_VENDOR_EXT_OUI
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
+config AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST
+	bool "Create STA entry before authorization is completed"
+
 endmenu
 endif
diff --git a/map-agent/Makefile b/map-agent/Makefile
index 0b34f6cf1..59edc8870 100644
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.1.0.3
+PKG_VERSION:=4.1.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a88085e17295fe7b303775a64518b2f116f2aad7
+PKG_SOURCE_VERSION:=c28feecc7004307952d54c78f4110c5763dbe0ee
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -78,6 +78,9 @@ TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EX
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
+ifeq ($(CONFIG_AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST),y)
+TARGET_CFLAGS += -DUNAUTHORIZED_STA_IN_ASSOCLIST
+endif
 
 MAKE_PATH:=src