diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index fb4ba1016..bacbd7b2b 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -365,19 +365,7 @@ namespace MWDialogue
         }
 
         // check the available services of this actor
-        int services = 0;
-        if (mActor.getTypeName() == typeid(ESM::NPC).name())
-        {
-            MWWorld::LiveCellRef<ESM::NPC>* ref = mActor.get<ESM::NPC>();
-            if (ref->mBase->mHasAI)
-                services = ref->mBase->mAiData.mServices;
-        }
-        else if (mActor.getTypeName() == typeid(ESM::Creature).name())
-        {
-            MWWorld::LiveCellRef<ESM::Creature>* ref = mActor.get<ESM::Creature>();
-            if (ref->mBase->mHasAI)
-                services = ref->mBase->mAiData.mServices;
-        }
+        int services = mActor.getClass().getServices(mActor);
 
         int windowServices = 0;
 
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index 5b89f4055..019baa297 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -46,7 +46,7 @@ struct NPC
       // Other services
       Spells        = 0x00800,
       MagicItems    = 0x01000,
-      Training      = 0x04000, // What skills?
+      Training      = 0x04000,
       Spellmaking   = 0x08000,
       Enchanting    = 0x10000,
       Repair        = 0x20000