diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts
index 005b76303b2..7ea8f618c62 100644
--- a/libs/tools/generator/components/src/credential-generator.component.ts
+++ b/libs/tools/generator/components/src/credential-generator.component.ts
@@ -197,7 +197,7 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
     this.maybeAlgorithm$
       .pipe(
         map((a) => {
-          if (a && a.i18nKeys.description) {
+          if (a?.i18nKeys?.description) {
             return translate(a.i18nKeys.description, this.i18nService);
           } else {
             return "";
diff --git a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
index 420f0bf0e1c..1558129a137 100644
--- a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
+++ b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
@@ -33,7 +33,7 @@ export abstract class CredentialGeneratorService {
 
   /** Emits metadata for the set of algorithms available to a user.
    *  @param type the set of algorithms
-   *  @param dependences.account$ algorithms are filtered to only
+   *  @param dependencies.account$ algorithms are filtered to only
    *   those matching the provided account's policy.
    *  @returns An observable that emits algorithm metadata.
    */