Let $k$ be a field of characteristic zero.
A $k$-automorphism of $k[[x,y]]$ was described in the answer to this question: $(x,y) \mapsto (A,B)$ is a $k$-automorphism if and only if $A,B$ are power series with no constant term whose linear parts are linearly independent.
It is known that the generators of the group of $k$-automorphisms of $k[x,y]$ are the affines $(x,y) \mapsto (ax+by+u,cx+dy+v)$, $ad-bc \in k-\{0\}$, and the triangulars $(x,y) \mapsto (ax,by+H(x))$, $ab \neq 0$, $H(x) \in k[x]$.
My question: Is it true that the generators of the group of $k$-automorphisms of $k[[x,y]]$ are $(x,y) \mapsto (ax+by,cx+dy)$, $ad-bc \in k-\{0\}$, and $(x,y) \mapsto (ax,by+H(x))$, $ab \neq 0$, $H(x) \in k[[x]]$ with no constant term?
Perhaps this is too good to be true? Can one find a $k$-automorphism which is not a finite composition of the above suggested generators?
Edit: It seems that the suggested generators do not generate all automorphisms of $k[[x,y]]$. Therefore, I change my question to: Is it possible to find additional "nice" generators that together indeed generate all automorphisms of $k[[x,y]]$? (I do not define 'nice', but I hope that it is understandable that I do not consider all automorphisms as a nice family of generators).