diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 2d12f84134..2aab9263b3 100755
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -309,8 +309,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     // Replace an HG ID with the simple asset ID so that we can persist textures for foreign HG avatars
                     asset.ID = asset.FullID.ToString();
 
+                    asset.Description ="NPC BAKED";
                     asset.Temporary = false;
                     asset.Local = false;
+                    asset.Flags &= ~AssetFlags.AvatarBake; // this can cause issues on older grids
                     m_scene.AssetService.Store(asset);
                 }