diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index b2e2e5589..7f1eb97a6 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -409,7 +409,11 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	}
 
 	public void setOwner(Player player) {
+		if (owner != null)
+			owner.setCreatureObject(null);
 		this.owner = player;
+		if (player != null && this instanceof CreatureObject)
+			player.setCreatureObject((CreatureObject) this);
 	}
 	
 	public void setLocation(Location l) {
diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index 18d2d7241..5580ee752 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -115,7 +115,6 @@ public class ObjectAwareness extends Service {
 					creature.destroyObject(obj.getOwner());
 				creature.clearAware();
 				creature.setOwner(null);
-				p.setCreatureObject(null);
 				break;
 			case PE_ZONE_IN_SERVER:
 				creature.clearAware(false);
diff --git a/src/services/player/CharacterCreationService.java b/src/services/player/CharacterCreationService.java
index 3594c8985..9d668a1d3 100644
--- a/src/services/player/CharacterCreationService.java
+++ b/src/services/player/CharacterCreationService.java
@@ -317,7 +317,6 @@ public class CharacterCreationService extends Service {
 		
 		playerObj.setAdminTag(player.getAccessLevel());
 		creatureObj.setOwner(player);
-		player.setCreatureObject(creatureObj);
 		new SkillBoxGrantedIntent(create.getStartingPhase(), creatureObj).broadcast();
 		return creatureObj.getObjectId();
 	}
diff --git a/src/services/player/ZoneManager.java b/src/services/player/ZoneManager.java
index 9db386a1e..aa303381d 100644
--- a/src/services/player/ZoneManager.java
+++ b/src/services/player/ZoneManager.java
@@ -139,7 +139,6 @@ public class ZoneManager extends Manager {
 	private void zoneInPlayer(Player player, CreatureObject creature, boolean firstZone) {
 		PlayerObject playerObj = creature.getPlayerObject();
 		player.setPlayerState(PlayerState.ZONING_IN);
-		player.setCreatureObject(creature);
 		creature.setOwner(player);
 		
 		if (firstZone)