Never log in again!
Merge pull request #376 from klynton/quick-fixes

Never log in again!