Adding OpenID returned mismatching email addresses to error screen.

Fixes #186 

@lloyd or @callahad to review, please.