The present invention is related to a composition for conditioning and improving curl retention of permanently shaped and/or natural curly hair comprising two optically separated phases at zero shear rate which becomes homogeneous upon shaking and returns to optically separated phases. Specifically, present invention is on two phase composition for hair comprising 5 to 50%, by weight calculated to total composition, oil phase and 50 to 95%, by weight calculated to total composition, an oil phase and 50 to 95%, by weight calculated to total composition, an aqueous phase wherein oil phase comprises at least one volatile oil at a concentration of 70 to 100%, by weight, calculated to the content of oil phase, and aqueous phase comprises 0.1 to 20% by weight calculated to the content of aqueous phase at least one fixing polymer, 10 to 40% by weight calculate to the content of aqueous phase at least one water miscible organic solvent and 0.05 to 2% by weight calculated to the content of the aqueous phase at least one cationic surfactant wherein oil and aqueous phases are optically separated at zero shear rate and becomes homogeneous upon shaking and returns again to optically separated two phases.
