Fixed login flow
Merge pull request #67 from calblueprint/fixlogin

Fixed login flow