login refactor phase 2, still more to do
Merge pull request #712 from patriot1burke/master

login refactor phase 2, still more to do