Fix password modal and login views

This is a quick fix for something I broke with the third-party auth changes.  The better solution is to factor out the form logic so updating it one place updates it everywhere, but we need to have a test suite in place before we can do that kind of refactoring.

@AlasdairSwan please review