Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -4182,6 +4182,7 @@
             _transformation = null;
             broadcastUserInfo();
             sendPacket(new SkillCoolTime(this));
+            _log.info("Transform Debug ID: 7");
         }
     }
     
@@ -4287,6 +4288,7 @@
             
             statement.setInt(1, 0);
             statement.setInt(2, getObjectId());
+            _log.info("Transform Debug ID: 8, Please check what your characters transform_id is set to in the characters table and tell Ahmed :)... it should be 0.");
             
             statement.execute();
             statement.close();
Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Effect.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Effect.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Effect.java	(working copy)
@@ -338,6 +338,7 @@
     public final void exit()
     {
         this.exit(false);
+        _log.info("Transform Debug ID: 5");
     }
 
     public final void exit(boolean preventUpdate)
@@ -345,6 +346,7 @@
     	preventExitUpdate = preventUpdate;
     	_state = EffectState.FINISHING;
     	scheduleEffect();
+    	_log.info("Transform Debug ID: 6");
     }
 
     /**
Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Character.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Character.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/model/L2Character.java	(working copy)
@@ -2904,7 +2904,9 @@
 		for(L2Effect e : effects)
 		{
 			// Stop active skills effects of the selected type
-			if (e.getEffectType() == type) e.exit();
+			if (e.getEffectType() == type)
+				e.exit();
+			_log.info("Transform Debug ID: 4");
 		}
 	}
 
@@ -3092,16 +3094,25 @@
     public final void stopTransformation(L2Effect effect)
     {
         if (effect == null)
+        {
             stopEffects(L2Effect.EffectType.TRANSFORMATION);
+            _log.info("Transform Debug ID: 2");
+        }
         else
+        {
             removeEffect(effect);
+            _log.info("Transform Debug ID: 2 ALT");
+        }
         
         // if this is a player instance, then untransform.
         if (this instanceof L2PcInstance)
         {
-            if (((L2PcInstance) this).getTransformation() != null) 
+            if (((L2PcInstance) this).getTransformation() != null)
+            {
             	// gm effect because removing skill didn't do it
             	((L2PcInstance) this).untransform();
+            	_log.info("Transform Debug ID: 3");
+            }
         }
         getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
         updateAbnormalEffect();
Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/skills/effects/EffectTransformation.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/skills/effects/EffectTransformation.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/skills/effects/EffectTransformation.java	(working copy)
@@ -62,15 +62,6 @@
     }
     
     @Override
-    public void onExit()
-    {
-        L2PcInstance trg = (L2PcInstance) getEffected();
-        if (trg == null)
-            return;
-        trg.untransform();
-    }
-    
-    @Override
     public boolean onActionTime()
     {
        return true;
Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/handler/skillhandlers/TransformDispel.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/handler/skillhandlers/TransformDispel.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/handler/skillhandlers/TransformDispel.java	(working copy)
@@ -14,6 +14,8 @@
  */
 package net.sf.l2j.gameserver.handler.skillhandlers;
 
+import java.util.logging.Logger;
+
 import net.sf.l2j.gameserver.handler.ISkillHandler;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2Object;
@@ -26,6 +28,8 @@
  */
 public class TransformDispel implements ISkillHandler
 {
+	protected static final Logger _log = Logger.getLogger(TransformDispel.class.getName());
+	
     private static final SkillType[] SKILL_IDS = { SkillType.TRANSFORMDISPEL };
     
     public void useSkill(L2Character activeChar, L2Skill skill,
@@ -47,6 +51,7 @@
             if (trg.isTransformed())
             {
                 activeChar.stopTransformation(null);
+                _log.info("Transform Debug ID: 1");
             }
         }
     }
Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/serverpackets/CharSelectionInfo.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/serverpackets/CharSelectionInfo.java	(revision 2005)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_GameServer_Commit/java/net/sf/l2j/gameserver/serverpackets/CharSelectionInfo.java	(working copy)
@@ -187,7 +187,8 @@
             writeH(charInfoPackage.getAugmentationId());
             writeH(0x00); // this is for augmentation too
             
-            writeD(charInfoPackage.getTransformId()); // Used to display Transformations
+            //writeD(charInfoPackage.getTransformId()); // Used to display Transformations
+            writeD(0x00); // Currently on retail when you are on character select you don't see your transformation.
         }
     }