Whoopsies fix some issues with ordinary login
Merge branch 'master' of https://github.com/googlejump/breakpoint