diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index 970587126a..58d8d43f6d 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -1,9 +1,14 @@
+// See https://aka.ms/azsdk/engsys/spellcheck to learn about spell check
+// configuration options including dealing with false positives.
 {
   "version": "0.1",
   "language": "en",
   "languageId": "cpp",
-  "dictionaries": ["powershell"],
-  "ignorePaths": ["vcpkg/**/*", "*.exe", "*.a", "*.lib", ".vscode/cspell.json", "json.hpp", "*nlohmann-json*"],
+  "dictionaries": ["powershell", "cpp"],
+  "ignorePaths": ["vcpkg/**/*", "*.exe", "*.a", "*.lib", ".vscode/cspell.json", "json.hpp", "*nlohmann-json*", "eng/common/**/*"],
+  // * Unless configured otherwise, these words are not case sensitive
+  // * Alphabetize the list when making changes so the list is easier for future
+  //   users to maintain and reason about.
   "words": [
     "ABFS",
     "ABNF",
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 8e47e21c67..0f6c57a15f 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -20,6 +20,9 @@ parameters:
   - name: CoverageReportPath
     type: string
     default: 'sdk/*/*/*cov_xml.xml'
+  - name: FailOnSpellingErrors
+    type: boolean
+    default: false
 
 jobs:
 - job: Validate
@@ -240,6 +243,8 @@ jobs:
       VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
     steps:
       - template: /eng/common/pipelines/templates/steps/check-spelling.yml
+        parameters:
+          ContinueOnError: ${ not(parameters.FailOnSpellingErrors) }
 
       - template: /eng/common/pipelines/templates/steps/verify-links.yml
         parameters: