Fixed a couple of crashes, and simplified the authentication screen.
