diff --git a/api.go b/api.go
index bdf6393e1c..d57e08a72e 100644
--- a/api.go
+++ b/api.go
@@ -72,9 +72,7 @@ func postAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[stri
 	if err != nil {
 		return err
 	} else {
-		// TODO: uncomment this
-		//		srv.runtime.graph.getHttpClient().Jar = cookiejar.NewCookieJar()
-		srv.runtime.authConfig = newAuthConfig
+		srv.registry.ResetClient(newAuthConfig)
 	}
 	if status != "" {
 		b, err := json.Marshal(&ApiAuth{Status: status})
diff --git a/registry/registry.go b/registry/registry.go
index d79b3e9f20..7a075e0e45 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -459,6 +459,11 @@ func (r *Registry) SearchRepositories(term string) (*SearchResults, error) {
 	return result, err
 }
 
+func (r *Registry) ResetClient(authConfig *auth.AuthConfig) {
+	r.authConfig = authConfig
+	r.client.Jar = cookiejar.NewCookieJar()
+}
+
 type SearchResults struct {
 	Query      string              `json:"query"`
 	NumResults int                 `json:"num_results"`