More vagrant user improvements