diff --git a/v3/api/client.go b/v3/api/client.go
index 3b4c389..0d0f9a1 100644
--- a/v3/api/client.go
+++ b/v3/api/client.go
@@ -133,11 +133,21 @@ func NewKeyfactorClient(cfg *auth_providers.Server, ctx *context.Context) (*Clie
 	initLogger(ctx)
 	client := Client{}
 	clientAuthType := cfg.GetAuthType()
+
+	baseConfig := auth_providers.CommandAuthConfig{
+		CommandHostName: cfg.Host,
+		CommandPort:     cfg.Port,
+		CommandAPIPath:  cfg.APIPath,
+		CommandCACert:   cfg.CACertPath,
+		SkipVerify:      cfg.SkipTLSVerify,
+	}
+
 	if clientAuthType == "basic" {
 		basicCfg := auth_providers.CommandAuthConfigBasic{
-			Username: cfg.Username,
-			Password: cfg.Password,
-			Domain:   cfg.Domain,
+			CommandAuthConfig: baseConfig,
+			Username:          cfg.Username,
+			Password:          cfg.Password,
+			Domain:            cfg.Domain,
 		}
 		aErr := basicCfg.Authenticate()
 		if aErr != nil {
@@ -151,9 +161,10 @@ func NewKeyfactorClient(cfg *auth_providers.Server, ctx *context.Context) (*Clie
 		return &client, nil
 	} else if clientAuthType == "oauth" {
 		oauthCfg := auth_providers.CommandConfigOauth{
-			ClientID:     cfg.ClientID,
-			ClientSecret: cfg.ClientSecret,
-			TokenURL:     cfg.OAuthTokenUrl,
+			CommandAuthConfig: baseConfig,
+			ClientID:          cfg.ClientID,
+			ClientSecret:      cfg.ClientSecret,
+			TokenURL:          cfg.OAuthTokenUrl,
 		}
 		aErr := oauthCfg.Authenticate()
 		if aErr != nil {