diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index 591d31aa..8cb1d8ff 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -674,13 +674,14 @@ public class PlayerService implements INetworkDispatch {
 	 */
 	public void resetLevel(CreatureObject creature) {
 		PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
+		SWGObject inventory = creature.getSlottedObject("inventory");
 		
 		try {
         	for (Long equipmentId : new ArrayList<Long>(creature.getEquipmentList())) {
         		
         		SWGObject equipment = core.objectService.getObject(equipmentId);
         		
-        		if (equipment == null) {
+        		if (equipment == null || equipment.getTemplate().startsWith("object/tangible/hair/")) {
         			continue;
         		}
         		
@@ -693,7 +694,7 @@ public class PlayerService implements INetworkDispatch {
         			case "object/weapon/creature/shared_creature_default_weapon.iff":
         				continue;
         			default:
-        				core.equipmentService.unequip(creature, equipment);
+        				creature.transferTo(creature, inventory, equipment);
        			}
         	}
 		} catch (Exception e) {