diff --git a/libs/tools/generator/components/src/credential-generator.component.html b/libs/tools/generator/components/src/credential-generator.component.html
index 06ea1f767b..737e32fa1f 100644
--- a/libs/tools/generator/components/src/credential-generator.component.html
+++ b/libs/tools/generator/components/src/credential-generator.component.html
@@ -56,7 +56,12 @@
       <form [formGroup]="username" class="box tw-container">
         <bit-form-field>
           <bit-label>{{ "type" | i18n }}</bit-label>
-          <bit-select [items]="usernameOptions$ | async" formControlName="nav"> </bit-select>
+          <bit-select
+            [items]="usernameOptions$ | async"
+            formControlName="nav"
+            data-testid="username-type"
+          >
+          </bit-select>
           <bit-hint *ngIf="!!(credentialTypeHint$ | async)">{{
             credentialTypeHint$ | async
           }}</bit-hint>
@@ -65,7 +70,12 @@
       <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="box tw-container">
         <bit-form-field>
           <bit-label>{{ "service" | i18n }}</bit-label>
-          <bit-select [items]="forwarderOptions$ | async" formControlName="nav"> </bit-select>
+          <bit-select
+            [items]="forwarderOptions$ | async"
+            formControlName="nav"
+            data-testid="email-forwarding-service"
+          >
+          </bit-select>
         </bit-form-field>
       </form>
       <tools-catchall-settings
diff --git a/libs/tools/generator/components/src/username-generator.component.html b/libs/tools/generator/components/src/username-generator.component.html
index 008903ff68..18b29a6184 100644
--- a/libs/tools/generator/components/src/username-generator.component.html
+++ b/libs/tools/generator/components/src/username-generator.component.html
@@ -33,7 +33,12 @@
       <form class="box" [formGroup]="username" class="tw-container">
         <bit-form-field>
           <bit-label>{{ "type" | i18n }}</bit-label>
-          <bit-select [items]="typeOptions$ | async" formControlName="nav"> </bit-select>
+          <bit-select
+            [items]="typeOptions$ | async"
+            formControlName="nav"
+            data-testid="username-type"
+          >
+          </bit-select>
           <bit-hint *ngIf="!!(credentialTypeHint$ | async)">{{
             credentialTypeHint$ | async
           }}</bit-hint>
@@ -42,7 +47,12 @@
       <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="box tw-container">
         <bit-form-field>
           <bit-label>{{ "service" | i18n }}</bit-label>
-          <bit-select [items]="forwarderOptions$ | async" formControlName="nav"> </bit-select>
+          <bit-select
+            [items]="forwarderOptions$ | async"
+            formControlName="nav"
+            data-testid="email-forwarding-service"
+          >
+          </bit-select>
         </bit-form-field>
       </form>
       <tools-catchall-settings