slight code refactor and moved OpenID into ExtraProviders