diff --git a/ryzom/common/data_common/r2/r2_features_default.lua b/ryzom/common/data_common/r2/r2_features_default.lua
index d94e2f656..44afdc6c2 100644
--- a/ryzom/common/data_common/r2/r2_features_default.lua
+++ b/ryzom/common/data_common/r2/r2_features_default.lua
@@ -405,7 +405,7 @@ local registerFeature = function ()
 				{Name="Aggro", Type="Number",  Min="0", Max="120", DefaultValue="30", DefaultInBase=1, 
 					Visible=function(this) return this:isGroupedAndLeader() or not this:isGrouped() and not this:isBotObject() end
 				},
-				{Name="TypeNPC", Type="Number", WidgetStyle="EnumDropDown", SecondRequestFunc=r2.updateType,
+				{Name="TypeNPC", Type="Number", WidgetStyle="EnumDropDown", SecondRequestFunc=function(value) r2:updateType(true) end,
 					Enum= {}, Visible=true, DefaultValue="-1",
 				},	
 
@@ -858,7 +858,7 @@ local registerFeature = function ()
 					Visible=true
 				},
 				{Name="Level", Type="Number", WidgetStyle="EnumDropDown", Category="uiR2EDRollout_NpcCustom",
-					Enum= { "uiR2EDLowLevel", "uiR2EDAverageLevel", "uiR2EDHighLevel", "uiR2EDVeryHighLevel"}, SecondRequestFunc=r2.updateLevel,
+					Enum= { "uiR2EDLowLevel", "uiR2EDAverageLevel", "uiR2EDHighLevel", "uiR2EDVeryHighLevel"}, SecondRequestFunc=function(value) r2.updateLevel(value, true) end,
 					Visible=function(this) return this:isGroupedAndLeader() or not this:isGrouped() and not this:isBotObject() end
 				},
 			},
diff --git a/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua b/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
index 0f625e24e..2d0bbb70a 100644
--- a/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
+++ b/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
@@ -401,7 +401,8 @@ function r2:initTypeUI(instance)
 
 		if tostring(instance.TypeNPC)=="-1" then
 			-- TypeNPC
-			r2:setNpcAttribute(instance.InstanceId, "TypeNPC", place)
+			debugInfo("FIXME: TypeNPC is not initialized, it should be a local value only as it's a convenience switch, verify against older versions");
+			r2.requestSetGhostNode(instance.InstanceId, "TypeNPC", place)
 		end
 	end
 end
@@ -1245,7 +1246,7 @@ function r2:updateSex()
 end
 
 -- UPDATE SEX ---------------------------------------------------------------------------------
-function r2:updateType()
+function r2:updateType(existingAction)
 	
 	local selection = r2:getSelectedInstance()
 	if selection == nil then return end
@@ -1256,7 +1257,9 @@ function r2:updateType()
 	local base = r2.sheetTypeCB[typeNPC].Id
 	local typeElement = r2.getPaletteElement(base)
 
-	r2.requestNewAction(i18n.get("uiR2EDUpdateNpcTypeAction"))
+	if not existingAction then
+		r2.requestNewAction(i18n.get("uiR2EDUpdateNpcTypeAction"))
+	end
 
 	-- TypeNPC
 	r2:setNpcAttribute(selection.InstanceId, "TypeNPC", typeNPC)
@@ -1350,7 +1353,9 @@ function r2:updateType()
 		end
 	end
 
-	r2.requestEndAction()
+	if not existingAction then
+		r2.requestEndAction()
+	end
 end
 
 -- UPDATE FUCNTION ----------------------------------------------------------------------------
@@ -1368,7 +1373,7 @@ function r2:updateFunction()
 end
 
 -- UPDATE LEVEL ------------------------------------------------------------------------------
-r2.updateLevel = function(value)
+r2.updateLevel = function(value, existingAction)
 
 	local selection = r2:getSelectedInstance()
 	assert(selection)
@@ -1380,7 +1385,9 @@ r2.updateLevel = function(value)
 	local firstPart = string.sub(sheet, 1, s-2)
 	local newSheet = firstPart .. level .. ".creature"
 
-	r2.requestNewAction(i18n.get("uiR2EDUpdateNpcLevelAction"))
+	if not existingAction then
+		r2.requestNewAction(i18n.get("uiR2EDUpdateNpcLevelAction"))
+	end
 	r2:setNpcAttribute(selection.InstanceId, "Sheet", newSheet)
 end