diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp
index 7ec73d3f2..4f64c7a58 100644
--- a/common/inventory_profile.cpp
+++ b/common/inventory_profile.cpp
@@ -264,10 +264,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
 				fail_state = swapRaceClass;
 				return false;
 			}
-			/*if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) {
+			if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) {
 				fail_state = swapDeity;
 				return false;
-			}*/
+			}
 			if (level && item_a->ReqLevel && level < item_a->ReqLevel) {
 				fail_state = swapLevel;
 				return false;
@@ -290,10 +290,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
 				fail_state = swapRaceClass;
 				return false;
 			}
-			/*if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) {
+			if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) {
 				fail_state = swapDeity;
 				return false;
-			}*/
+			}
 			if (level && item_b->ReqLevel && level < item_b->ReqLevel) {
 				fail_state = swapLevel;
 				return false;
diff --git a/zone/inventory.cpp b/zone/inventory.cpp
index 916818166..29c2b4cb3 100644
--- a/zone/inventory.cpp
+++ b/zone/inventory.cpp
@@ -1826,17 +1826,15 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		}
 
 		EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid;
-		if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state, GetRace(), GetClass(), GetDeity(), GetLevel())) {
+		if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state, GetBaseRace(), GetBaseClass(), GetDeity(), GetLevel())) {
 			const char* fail_message = "The selected slot was invalid.";
 			if (fail_state == EQEmu::InventoryProfile::swapRaceClass || fail_state == EQEmu::InventoryProfile::swapDeity)
 				fail_message = "Your class, deity and/or race may not equip that item.";
 			else if (fail_state == EQEmu::InventoryProfile::swapLevel)
 				fail_message = "You are not sufficient level to use this item.";
 			
-			if (fail_message) {
+			if (fail_message)
 				Message(CC_Red, "%s", fail_message);
-				//Log(Logs::General, Logs::Error, "[%s] %s (r:%u, c:%u, d:%u, l:%u)", GetCleanName(), fail_message, GetRace(), GetClass(), GetDeity(), GetLevel());
-			}
 
 			return false;
 		}