The present invention relates to a composition comprising one or more quaternary ester ammonium compounds (a), one or more amidoamine compounds (b), wherein the weight ratio between the one or more quaternary ester ammonium compounds (a) and the one or more amidoamine compounds (b) is within a range of 1:5 to 5:1, and one or more fatty alcohols (c). The present invention also relates to a composition that is solid at room temperature, to a hair conditioner composition and to a method to prepare the hair conditioner composition by dispersing the solid composition in water at moderate temperatures.