diff --git a/govcd/api_token.go b/govcd/api_token.go
index 9d038aa60..41040ff0b 100644
--- a/govcd/api_token.go
+++ b/govcd/api_token.go
@@ -43,7 +43,10 @@ func (vcdClient *VCDClient) GetBearerTokenFromApiToken(org, token string) (*type
 		return nil, fmt.Errorf("minimum API version for API token is 36.1 - Version detected: %s", vcdClient.Client.APIVersion)
 	}
 	var userDef string
-	urlStr := strings.Replace(vcdClient.Client.VCDHREF.String(), "/api", "", 1)
+	newUrl := new(url.URL)
+	newUrl.Scheme = vcdClient.Client.VCDHREF.Scheme
+	newUrl.Host = vcdClient.Client.VCDHREF.Host
+	urlStr := newUrl.String()
 	if strings.EqualFold(org, "system") {
 		userDef = "provider"
 	} else {
diff --git a/scripts/staticcheck-config.sh b/scripts/staticcheck-config.sh
index f0049c92c..920b9c6b0 100644
--- a/scripts/staticcheck-config.sh
+++ b/scripts/staticcheck-config.sh
@@ -1,3 +1,3 @@
 export STATICCHECK_URL=https://github.com/dominikh/go-tools/releases/download
-export STATICCHECK_VERSION=v0.3.3
+export STATICCHECK_VERSION=2023.1
 export STATICCHECK_FILE=staticcheck_linux_amd64.tar.gz