Issue 818

OpenID PR