Hair conditioner comprising silicone and a conditioning gel phase, said phase obtainable by heating a fatty alcohol and an oil until they are molten, separately heating a cationic surfactant in water until it is dissolved/suspended, then adding the molten fatty alcohol and oil mix to the cationic surfactant before adding any remaining ingredients.