Merge pull request #1 from xtuple/master

Catch up.
issue #20503: Fix a few problems with login
Merge pull request #9 from jrogelstad/master

issue #20503: Some additional fixes.