diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 84099caaaf..5963440423 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -7,6 +7,7 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
+#include "../mwworld/world.hpp"
 #include "../mwworld/environment.hpp"
 
 #include "../mwrender/objects.hpp"
@@ -90,7 +91,7 @@ namespace MWClass
         ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
             ptr.get<ESM::Miscellaneous>();
 
-        if (ref->base->name =="Gold")
+        if (ref->base->name == environment.mWorld->getStore().gameSettings.search("sGold")->str)
         {
             return std::string("Item Gold Up");
         }
@@ -102,7 +103,7 @@ namespace MWClass
         ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
             ptr.get<ESM::Miscellaneous>();
 
-        if (ref->base->name =="Gold")
+        if (ref->base->name == environment.mWorld->getStore().gameSettings.search("sGold")->str)
         {
             return std::string("Item Gold Down");
         }
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 25361ffcc6..ce31741689 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -158,7 +158,12 @@ IntSize ToolTips::getToolTipViaPtr ()
         /// \todo We don't want tooltips for NPCs in combat mode.
         ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* ref = mFocusObject.get<ESM::NPC>();
 
-        tooltipSize = createToolTip(ref->base->name, "");
+        std::string text;
+        if (mFullHelp) {
+            text += "\n Script: " + ref->base->script;
+        }
+
+        tooltipSize = createToolTip(ref->base->name, text);
     }
 
     // --------------------  Creature -------------------------------
@@ -167,7 +172,12 @@ IntSize ToolTips::getToolTipViaPtr ()
         /// \todo We don't want tooltips for Creatures in combat mode.
         ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData>* ref = mFocusObject.get<ESM::Creature>();
 
-        tooltipSize = createToolTip(ref->base->name, "");
+        std::string text;
+        if (mFullHelp) {
+            text += "\n Script: " + ref->base->script;
+        }
+
+        tooltipSize = createToolTip(ref->base->name, text);
     }
 
     // --------------------  Container -------------------------------