Revert "Merge pull request #94 from ChrisCooper/bugs/login_issue"

Wasn't ready for merging, has an issue with invalid credentials

This reverts commit 8a9ab47fbe4c14bed5680d9973f5c96e713fe556, reversing
changes made to c8cc12e6cb9c1e1d4c3226a61479ce6d8c101738.