diff --git a/plugin.rb b/plugin.rb
index 25705a8..77c88fb 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -20,14 +20,10 @@ class OAuth2BasicAuthenticator < ::Auth::OAuth2Authenticator
                           authorize_url: SiteSetting.oauth2_authorize_url,
                           token_url: SiteSetting.oauth2_token_url
                         }
+                        opts[:token_params] = {headers: {'Authorization' => basic_auth_header }}
                       }
   end
 
-  def build_access_token
-    options.token_params.merge!(:headers => {'Authorization' => basic_auth_header })
-    super
-  end
-
   def basic_auth_header
     "Basic " + Base64.strict_encode64("#{SiteSetting.oauth2_client_id}:#{SiteSetting.oauth2_client_secret}")
   end