diff --git a/zone/mob.cpp b/zone/mob.cpp
index 2b43ff5e2..a06dbc743 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1266,8 +1266,6 @@ void Mob::CreateSpawnPacket(EQApplicationPacket* app, NewSpawn_Struct* ns) {
 	} else {
 		strcpy(ns2->spawn.lastName, ns->spawn.lastName);
 	}
-
-	memset(&app->pBuffer[sizeof(Spawn_Struct)-7], 0xFF, 7);
 }
 
 void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
diff --git a/zone/npc.cpp b/zone/npc.cpp
index f65bd7fad..f1260cd9c 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -2156,6 +2156,7 @@ void NPC::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
 	UpdateActiveLight();
 	ns->spawn.light = GetActiveLightType();
 	ns->spawn.show_name = NPCTypedata->show_name;
+	ns->spawn.trader = false;
 }
 
 void NPC::PetOnSpawn(NewSpawn_Struct* ns)