Improve toolchain's shadow patch in order to be able to add a user