In an embodiment, a cosmetic composition comprises, in a cosmetic carrier, based in each case on the total weight of the composition comprises: a) at least one selected amino acid and/or at least one selected oligopeptide, in a total quantity of 0.0001 to 10.0 wt %, b) at least one selected plant-based cationic surfactant, in a total quantity of 0.1 to 10.0 wt % and/or at least one amino acid, in a total quantity of 0.01 to 10.0 wt %. A method for treating keratinic fibers, comprises: applying the cosmetic composition onto the keratinic fibers and rinsing the cosmetic composition from the keratinic fibers after a contact time from a few seconds to 45 minutes.