If an email address is specified for authentication, fill it in and go to the password screen (if address is registered).

This finishes up #336, and also gets us ready for a site to be able to specify a preferred email address.

close #336.