diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb
index c2a1d11..abe7114 100644
--- a/plugins/oauth_client/lib/oauth_client_plugin.rb
+++ b/plugins/oauth_client/lib/oauth_client_plugin.rb
@@ -56,7 +56,8 @@ class OauthClientPlugin < Noosfero::Plugin
         domain = Domain.find_by_name(request.host)
         environment = domain.environment rescue Environment.default
 
-        provider_id = request.session['omniauth.params'] ? request.session['omniauth.params']['id'] : request.params['id']
+        provider_id = request.params['id']
+        provider_id ||= request.session['omniauth.params']['id'] if request.session['omniauth.params']
         provider = environment.oauth_providers.find(provider_id)
         strategy.options.merge!(provider.options.symbolize_keys)
 
--
libgit2 0.21.2