The present invention relates to a method of preparation of a water based epoxy resin curing agent in dispersion form which is formed by combining an amine-functional dispersion (A) with an amine-functional curing agent (B). The invention also relates to the curing agent obtained from said method, its use for curing two component water based epoxy systems, compositions obtained from such curing and various uses of the compositions obtained.