Feature/openid enhancements