maybe have change password and email on same page
check for form.password in the off chance that a user is logged in and the server switches the authentication method from basic_auth to openid.
fix tests to use new change_email view
move links to the bottom of the page until we have a tabbed UI