Disclosed is a hair conditioning composition comprising: a cationic surfactant; a high melting point fatty compound; a cyclic compound selected from the group consisting of a vitamin B3 compound, a xanthine compound, a salicylic acid ester, and mixtures thereof; a compound having at least three large head groups; and an aqueous carrier. The composition of the present invention provides improved hair manageability.