diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e638d9a1de..a21b4f7bcd 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4798,6 +4798,10 @@ Label_GroupsDone:
             if (sp != null)
             {
                 sp.ControllingClient.Close(force, force);
+
+                if(sp.IsNPC && UserManagementModule != null)
+                    UserManagementModule.RemoveUser(sp.UUID);
+
                 return true;
             }