Openid improvements

PTAL