Add explicit home dir option for ExpandUser