diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28a28534d..bd52f521c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ Canonical reference for changes, improvements, and bugfixes for Boundary.
   a missing mandated cipher suite of the HTTP/2 (`h2`) specification that could
   result in no shared cipher suites between the Boundary API listener and those
   clients. ([PR](https://github.com/hashicorp/boundary/pull/1637))
+* vault: Fix credential store support when using Vault namespaces
+  ([Issue](https://github.com/hashicorp/boundary/issues/1597),
+  [PR](https://github.com/hashicorp/boundary/pull/1660))
 
 ## 0.6.2 (2021/09/27)
 
diff --git a/internal/credential/vault/vault.go b/internal/credential/vault/vault.go
index 9f29c6f95..0e2cc1add 100644
--- a/internal/credential/vault/vault.go
+++ b/internal/credential/vault/vault.go
@@ -79,6 +79,10 @@ func newClient(c *clientConfig) (*client, error) {
 	}
 	vClient.SetToken(string(c.Token))
 
+	if c.Namespace != "" {
+		vClient.SetNamespace(c.Namespace)
+	}
+
 	return &client{
 		cl:    vClient,
 		token: c.Token,