[#2851] Minor tweaks to new trick to get the web server user