diff --git a/Source/Game/Entities/Item/ItemTemplate.cs b/Source/Game/Entities/Item/ItemTemplate.cs
index 9eb1072ad..36d632779 100644
--- a/Source/Game/Entities/Item/ItemTemplate.cs
+++ b/Source/Game/Entities/Item/ItemTemplate.cs
@@ -40,6 +40,15 @@ namespace Game.Entities
             return ExtendedData.Display[locale];
         }
 
+        public bool HasSignature()
+        {
+            return GetMaxStackSize() == 1 &&
+                GetClass() != ItemClass.Consumable &&
+                GetClass() != ItemClass.Quest &&
+                !GetFlags().HasFlag(ItemFlags.NoCreator) &&
+                GetId() != 6948; /*Hearthstone*/
+        }
+        
         public bool CanChangeEquipStateInCombat()
         {
             switch (GetInventoryType())
diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index b80631492..fd339f23f 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -1031,7 +1031,7 @@ namespace Game.Spells
                 }
 
                 // set the "Crafted by ..." property of the item
-                if (pItem.GetTemplate().GetClass() != ItemClass.Consumable && pItem.GetTemplate().GetClass() != ItemClass.Quest && newitemid != 6265 && newitemid != 6948)
+                if (pItem.GetTemplate().HasSignature())
                     pItem.SetCreator(player.GetGUID());
 
                 // send info to the client