diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6530f140c1..86bfbf056b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2100,6 +2100,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         private LSL_Key NpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, bool owned)
         {
+            if (firstname != String.Empty || lastname != String.Empty)
+            {
+                if (firstname != "Shown outfit:")
+                    firstname = "NPC: " + firstname;
+            }
+
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             if (module != null)
             {