diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index d8c019644..60260a812 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -2,6 +2,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "inventorystore.hpp"
 #include "player.hpp"
@@ -15,8 +16,7 @@ namespace MWWorld
 
     void ActionEquip::executeImp (const Ptr& actor)
     {
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
 
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(getTarget()).getEquipmentSlots(getTarget());
@@ -32,11 +32,61 @@ namespace MWWorld
         }
 
         assert(it != invStore.end());
+        
+        std::string npcRace = actor.get<ESM::NPC>()->mBase->mRace;
 
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
+
+            // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
+            if(npcRace == "argonian" || npcRace == "khajiit")
+            {
+                if(*slot == MWWorld::InventoryStore::Slot_Helmet){ 
+                    std::vector<ESM::PartReference> parts;
+
+                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
+                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                    else
+                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+
+                    bool allow = true;
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PartReferenceType::PRT_Head)
+                        {
+                            if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}", std::vector<std::string>());
+                        
+                            allow = false;
+                            break;
+                        }
+                    }
+                    
+                    if(!allow)
+                        break;
+                }
+
+                if (*slot == MWWorld::InventoryStore::Slot_Boots)
+                {  
+                    // Only notify the player, not npcs
+                    if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                    {
+                        if(it.getType() == MWWorld::ContainerStore::Type_Clothing){ // It's shoes
+                            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}", std::vector<std::string>());
+                        }
+
+                        else // It's boots
+                        {
+                            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}", std::vector<std::string>());
+                        }
+                    }
+                    break;
+                }
+
+            }
+
             // if all slots are occupied, replace the last slot
             if (slot == --slots.first.end())
             {