diff --git a/py-json/vap_profile.py b/py-json/vap_profile.py
index 2dc8f15b..b94de228 100644
--- a/py-json/vap_profile.py
+++ b/py-json/vap_profile.py
@@ -290,7 +290,7 @@ class VAPProfile(LFCliBase):
         self.add_vap_data["flags"] = self.add_named_flags(self.desired_add_vap_flags, add_vap.add_vap_flags)
         self.add_vap_data["flags_mask"] = self.add_named_flags(self.desired_add_vap_flags_mask, add_vap.add_vap_flags)
         self.add_vap_data["radio"] = radio
-
+        # TODO: add_vap_data should not hold shelf and resource; duplicate
         self.add_vap_data["resource"] = resource
         self.set_port_data["current_flags"] = self.add_named_flags(self.desired_set_port_current_flags,
                                                                    set_port.set_port_current_flags)
diff --git a/py-scripts/modify_vap.py b/py-scripts/modify_vap.py
index 5ef8438a..ec11cbfb 100755
--- a/py-scripts/modify_vap.py
+++ b/py-scripts/modify_vap.py
@@ -16,6 +16,7 @@ sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
 
 lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base")
 LFCliBase = lfcli_base.LFCliBase
+LFUtils = importlib.import_module("py-json.LANforge.LFUtils")
 realm = importlib.import_module("py-json.realm")
 Realm = realm.Realm
 
@@ -55,7 +56,12 @@ class ModifyVAP(Realm):
         self.debug = _debug_on
         self.dhcp = _dhcp
         self.vap_profile = self.new_vap_profile()
-        self.vap_profile.vap_name = self.vap_list
+        shelf, resource, port, *nil = LFUtils.name_to_eid(self.vap_list)
+        self.vap_profile.resource = resource      
+        self.vap_profile.shelf = shelf
+        self.vap_profile.add_vap_data["resource"] = resource      
+        self.vap_profile.add_vap_data["shelf"] = shelf
+        self.vap_profile.vap_name = port
         self.vap_profile.ssid = self.ssid
         self.vap_profile.security = self.security
         self.vap_profile.ssid_pass = self.password