fix issue with Else and slightly refactor login
Merge pull request #41 from mtbc/Insight-UI-testing-11210

fix issue with Else and slightly refactor login