Don't require accounts-password anymore, display password login templates conditionally like oauth templates.
Add wording and templates around configuration of oauth.  Also prevent default actions on oauth links.