OpenID update and fix from previous mistakes