You are correct! Ammonia forms hydrogen bonds with water both by sharing its electropositive hydrogen atoms and by sharing its non-bonding electron pair. It is very much like water in this respect.