The invention concerns a hair conditioning composition for permanent and semi-permanent hair color applications characterized in that the hair conditioning composition comprises a solvent a water-soluble, oligo-peptide from a natural proteinous raw-material source containing Sulfur alkaline or alkaline earth metal ions a multidentate ligand or chelating agent and optionally a redox-active inorganic or organic component. EP2644186A1