OpenID fixes and template fix