diff --git a/Gopkg.lock b/Gopkg.lock
index fb73c06..b1dd8dd 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,7 +2,7 @@
 
 
 [[projects]]
-  digest = "1:400f59817639afc9724a4ebbb673ed6de133fe9e9989b552aafec4c6cc31c601"
+  digest = "1:e2d22520a8df49ecc89f476c41cc50c89f72d5e52abd0e18564825df6c58a510"
   name = "github.com/cloudtrust/common-service"
   packages = [
     ".",
@@ -10,8 +10,8 @@
     "log",
   ]
   pruneopts = ""
-  revision = "a378b70b4d40f96407e066b6d4fb17d70f29074c"
-  version = "v1.2.4"
+  revision = "790d30f843ed1e0868693c39f2345a7840925075"
+  version = "v1.2.5"
 
 [[projects]]
   digest = "1:bb7f91ab4d1c44a3bb2651c613463c134165bda0282fca891a63b88d1b501997"
@@ -59,20 +59,20 @@
   version = "v0.5.0"
 
 [[projects]]
-  digest = "1:b852d2b62be24e445fcdbad9ce3015b44c207815d631230dfce3f14e7803f5bf"
+  digest = "1:232da37b3204bcdb01af3df45982d154798e191b4d94357191d164e254070771"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
   pruneopts = ""
-  revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
-  version = "v1.3.2"
+  revision = "d23c5127dc24889085f8ccea5c9d560a57a879d8"
+  version = "v1.3.3"
 
 [[projects]]
-  digest = "1:883e2fdbdd0e577187bd8106fec775b1176059af267a7f40eba5308955c67d52"
+  digest = "1:fbab76ba211c99fcd45a481a32530efc229f3510fd94889f361dcaf13ff05fe0"
   name = "github.com/gorilla/mux"
   packages = ["."]
   pruneopts = ""
-  revision = "00bdffe0f3c77e27d2cf6f5c70232a2d3e4d9c15"
-  version = "v1.7.3"
+  revision = "75dcda0896e109a2a22c9315bca3bb21b87b2ba5"
+  version = "v1.7.4"
 
 [[projects]]
   digest = "1:1d7e1867c49a6dd9856598ef7c3123604ea3daabf5b83f303ff457bcbc410b1d"
@@ -110,16 +110,16 @@
   version = "v1.0.5"
 
 [[projects]]
-  digest = "1:f7b541897bcde05a04a044c342ddc7425aab7e331f37b47fbb486cd16324b48e"
+  digest = "1:afd6af0d5299495ffe15af3fde504097f66dd40235831d4078ddf112133b9b5a"
   name = "github.com/stretchr/testify"
   packages = ["assert"]
   pruneopts = ""
-  revision = "221dbe5ed46703ee255b1da0dec05086f5035f62"
-  version = "v1.4.0"
+  revision = "624f997379a27f38832b4b22ef5e4d31385c6daf"
+  version = "v1.5.0"
 
 [[projects]]
   branch = "master"
-  digest = "1:8dc5306c5097afa86c85335c9e981a22c164aab641ff749f88d2eecf9dbfdb93"
+  digest = "1:58c4f5cde1e9820c1304cba1f284f96fd8a1dadba173695788b87aa8327f5873"
   name = "golang.org/x/crypto"
   packages = [
     "ed25519",
@@ -127,11 +127,11 @@
     "pbkdf2",
   ]
   pruneopts = ""
-  revision = "530e935923ad688be97c15eeb8e5ee42ebf2b54a"
+  revision = "1d94cc7ab1c630336ab82ccb9c9cda72a875c382"
 
 [[projects]]
   branch = "master"
-  digest = "1:bce1fb1dafa615413d845819aa75ba69d0979cdc2ac3b840e1c19c802a737916"
+  digest = "1:a6b4c0203496549bdd9eb7a34a9c34aa428851951f3bdea48fc3332b3633d8fe"
   name = "golang.org/x/net"
   packages = [
     "context",
@@ -140,7 +140,7 @@
     "publicsuffix",
   ]
   pruneopts = ""
-  revision = "6afb5195e5aab057fda82e27171243402346b0ad"
+  revision = "16171245cfb220d5317888b716d69c1fb4e7992b"
 
 [[projects]]
   branch = "master"
@@ -195,7 +195,7 @@
   version = "v1.6.5"
 
 [[projects]]
-  digest = "1:e3250d192192f02fbb143d50de437cbe967d6be7bd9fad671600942a33269d08"
+  digest = "1:95fa5eae3b22887e8aea55ad4f93bc1374d586f7dd3504cf0010845ccc0a95a8"
   name = "gopkg.in/h2non/gentleman.v2"
   packages = [
     ".",
@@ -214,8 +214,8 @@
     "utils",
   ]
   pruneopts = ""
-  revision = "e0f81be2f4064ea7aa7470e9daddd2dc8e8152c7"
-  version = "v2.0.3"
+  revision = "34f7caeaf69f4668a88f8294ec18665fd2756b84"
+  version = "v2.0.4"
 
 [[projects]]
   digest = "1:edd75ef05376347c02f40c36f2896d4aee3b8cbfe8247299c71aefd7ca28f443"
diff --git a/Gopkg.toml b/Gopkg.toml
index 00e1684..24fe6d5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -22,7 +22,7 @@
 
 [[constraint]]
   name = "github.com/cloudtrust/common-service"
-  version = "v1.2.4"
+  version = "v1.2.5"
 
 [[constraint]]
   name = "github.com/pkg/errors"
diff --git a/oidc_connect_test.go b/oidc_connect_test.go
index d94870c..73dbe6e 100644
--- a/oidc_connect_test.go
+++ b/oidc_connect_test.go
@@ -45,31 +45,31 @@ func TestCreateToken(t *testing.T) {
 	defer ts.Close()
 
 	t.Run("No body in HTTP response", func(t *testing.T) {
-		var p = NewOidcTokenProvider(Config{AddrAPI: ts.URL}, "nobody", "user", "passwd", "clientID", log.NewNopLogger())
+		var p = NewOidcTokenProvider(Config{AddrTokenProvider: ts.URL}, "nobody", "user", "passwd", "clientID", log.NewNopLogger())
 		var _, err = p.ProvideToken(context.TODO())
 		assert.NotNil(t, err)
 	})
 
 	t.Run("Invalid credentials", func(t *testing.T) {
-		var p = NewOidcTokenProvider(Config{AddrAPI: ts.URL}, "invalid", "user", "passwd", "clientID", log.NewNopLogger())
+		var p = NewOidcTokenProvider(Config{AddrTokenProvider: ts.URL}, "invalid", "user", "passwd", "clientID", log.NewNopLogger())
 		var _, err = p.ProvideToken(context.TODO())
 		assert.NotNil(t, err)
 	})
 
 	t.Run("Invalid JSON", func(t *testing.T) {
-		var p = NewOidcTokenProvider(Config{AddrAPI: ts.URL}, "bad-json", "user", "passwd", "clientID", log.NewNopLogger())
+		var p = NewOidcTokenProvider(Config{AddrTokenProvider: ts.URL}, "bad-json", "user", "passwd", "clientID", log.NewNopLogger())
 		var _, err = p.ProvideToken(context.TODO())
 		assert.NotNil(t, err)
 	})
 
 	t.Run("No HTTP response", func(t *testing.T) {
-		var p = NewOidcTokenProvider(Config{AddrAPI: ts.URL + "0"}, "bad-json", "user", "passwd", "clientID", log.NewNopLogger())
+		var p = NewOidcTokenProvider(Config{AddrTokenProvider: ts.URL + "0"}, "bad-json", "user", "passwd", "clientID", log.NewNopLogger())
 		var _, err = p.ProvideToken(context.TODO())
 		assert.NotNil(t, err)
 	})
 
 	t.Run("Valid credentials", func(t *testing.T) {
-		var p = NewOidcTokenProvider(Config{AddrAPI: ts.URL}, "valid", "user", "passwd", "clientID", log.NewNopLogger())
+		var p = NewOidcTokenProvider(Config{AddrTokenProvider: ts.URL}, "valid", "user", "passwd", "clientID", log.NewNopLogger())
 
 		var timeStart = time.Now()