Backport of #11702

set up FS by username, not login name\!

better variable name