Fixed inevitable NPE when changing OpenID on a non-merged account

Prevent the [server from sad-facing](http://meta.stackoverflow.com/questions/161423). Will look at cleaning up the whole OpenID mess here in the near future.