Merge pull request #36 from xtuple/master

Catch up.
issue #20207: Fix user problem
Merge branch 'master' of github.com:jrogelstad/xtuple
Merge pull request #449 from jrogelstad/master

issue #20207: Fix user problem.