diff --git a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html
index 7048ea4fd00..55e6678bd58 100644
--- a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html
@@ -14,34 +14,31 @@
         {{ "exposedPasswordsFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
       </bit-callout>
 
-      @if (!isAdminConsoleActive && canDisplayToggleGroup()) {
-        <bit-toggle-group
-          *ngIf="showFilterToggle && !isAdminConsoleActive"
-          [selected]="filterOrgStatus$ | async"
-          (selectedChange)="filterOrgToggle($event)"
-          [attr.aria-label]="'addAccessFilter' | i18n"
-        >
-          <ng-container *ngFor="let status of filterStatus">
-            <bit-toggle [value]="status">
-              {{ getName(status) }}
-              <span bitBadge variant="info"> {{ getCount(status) }} </span>
-            </bit-toggle>
-          </ng-container>
-        </bit-toggle-group>
+      @if (showFilterToggle && !isAdminConsoleActive) {
+        @if (canDisplayToggleGroup()) {
+          <bit-toggle-group
+            [selected]="filterOrgStatus$ | async"
+            (selectedChange)="filterOrgToggle($event)"
+            [attr.aria-label]="'addAccessFilter' | i18n"
+          >
+            <ng-container *ngFor="let status of filterStatus">
+              <bit-toggle [value]="status">
+                {{ getName(status) }}
+                <span bitBadge variant="info"> {{ getCount(status) }} </span>
+              </bit-toggle>
+            </ng-container>
+          </bit-toggle-group>
+        } @else {
+          <bit-chip-select
+            [placeholderText]="chipSelectOptions[0].label"
+            [options]="chipSelectOptions"
+            [ngModel]="selectedFilterChip"
+            (ngModelChange)="filterOrgToggleChipSelect($event)"
+            fullWidth="true"
+          ></bit-chip-select>
+        }
       }
 
-      <!-- bit-chip-select start -->
-      @if (!isAdminConsoleActive && !canDisplayToggleGroup()) {
-        <bit-chip-select
-          [placeholderText]="chipSelectOptions[0].label"
-          [options]="chipSelectOptions"
-          [ngModel]="selectedFilterChip"
-          (ngModelChange)="filterOrgToggleChipSelect($event)"
-          fullWidth="true"
-        ></bit-chip-select>
-      }
-      <!-- bit-chip-select end-->
-
       <bit-table-scroll [dataSource]="dataSource" [rowSize]="75">
         <ng-container header>
           <th bitCell></th>
diff --git a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.html b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.html
index 568f74edb07..c03e28f2699 100644
--- a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.html
@@ -18,33 +18,32 @@
       <bit-callout type="danger" title="{{ 'inactive2faFound' | i18n }}">
         {{ "inactive2faFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
       </bit-callout>
-      @if (!isAdminConsoleActive && canDisplayToggleGroup()) {
-        <bit-toggle-group
-          *ngIf="showFilterToggle && !isAdminConsoleActive"
-          [selected]="filterOrgStatus$ | async"
-          (selectedChange)="filterOrgToggle($event)"
-          [attr.aria-label]="'addAccessFilter' | i18n"
-        >
-          <ng-container *ngFor="let status of filterStatus">
-            <bit-toggle [value]="status">
-              {{ getName(status) }}
-              <span bitBadge variant="info"> {{ getCount(status) }} </span>
-            </bit-toggle>
-          </ng-container>
-        </bit-toggle-group>
+
+      @if (showFilterToggle && !isAdminConsoleActive) {
+        @if (canDisplayToggleGroup()) {
+          <bit-toggle-group
+            [selected]="filterOrgStatus$ | async"
+            (selectedChange)="filterOrgToggle($event)"
+            [attr.aria-label]="'addAccessFilter' | i18n"
+          >
+            <ng-container *ngFor="let status of filterStatus">
+              <bit-toggle [value]="status">
+                {{ getName(status) }}
+                <span bitBadge variant="info"> {{ getCount(status) }} </span>
+              </bit-toggle>
+            </ng-container>
+          </bit-toggle-group>
+        } @else {
+          <bit-chip-select
+            [placeholderText]="chipSelectOptions[0].label"
+            [options]="chipSelectOptions"
+            [ngModel]="selectedFilterChip"
+            (ngModelChange)="filterOrgToggleChipSelect($event)"
+            fullWidth="true"
+          ></bit-chip-select>
+        }
       }
 
-      <!-- bit-chip-select start -->
-      @if (!isAdminConsoleActive && !canDisplayToggleGroup()) {
-        <bit-chip-select
-          [placeholderText]="chipSelectOptions[0].label"
-          [options]="chipSelectOptions"
-          [ngModel]="selectedFilterChip"
-          (ngModelChange)="filterOrgToggleChipSelect($event)"
-          fullWidth="true"
-        ></bit-chip-select>
-      }
-      <!-- bit-chip-select end-->
       <bit-table [dataSource]="dataSource">
         <ng-container header *ngIf="!isAdminConsoleActive">
           <tr bitRow>
diff --git a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.html b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.html
index eeaa58c41b5..62496dfad00 100644
--- a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.html
@@ -19,34 +19,31 @@
         {{ "reusedPasswordsFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
       </bit-callout>
 
-      @if (!isAdminConsoleActive && canDisplayToggleGroup()) {
-        <bit-toggle-group
-          *ngIf="showFilterToggle && !isAdminConsoleActive"
-          [selected]="filterOrgStatus$ | async"
-          (selectedChange)="filterOrgToggle($event)"
-          [attr.aria-label]="'addAccessFilter' | i18n"
-        >
-          <ng-container *ngFor="let status of filterStatus">
-            <bit-toggle [value]="status">
-              {{ getName(status) }}
-              <span bitBadge variant="info"> {{ getCount(status) }} </span>
-            </bit-toggle>
-          </ng-container>
-        </bit-toggle-group>
+      @if (showFilterToggle && !isAdminConsoleActive) {
+        @if (canDisplayToggleGroup()) {
+          <bit-toggle-group
+            [selected]="filterOrgStatus$ | async"
+            (selectedChange)="filterOrgToggle($event)"
+            [attr.aria-label]="'addAccessFilter' | i18n"
+          >
+            <ng-container *ngFor="let status of filterStatus">
+              <bit-toggle [value]="status">
+                {{ getName(status) }}
+                <span bitBadge variant="info"> {{ getCount(status) }} </span>
+              </bit-toggle>
+            </ng-container>
+          </bit-toggle-group>
+        } @else {
+          <bit-chip-select
+            [placeholderText]="chipSelectOptions[0].label"
+            [options]="chipSelectOptions"
+            [ngModel]="selectedFilterChip"
+            (ngModelChange)="filterOrgToggleChipSelect($event)"
+            fullWidth="true"
+          ></bit-chip-select>
+        }
       }
 
-      <!-- bit-chip-select start -->
-      @if (!isAdminConsoleActive && !canDisplayToggleGroup()) {
-        <bit-chip-select
-          [placeholderText]="chipSelectOptions[0].label"
-          [options]="chipSelectOptions"
-          [ngModel]="selectedFilterChip"
-          (ngModelChange)="filterOrgToggleChipSelect($event)"
-          fullWidth="true"
-        ></bit-chip-select>
-      }
-      <!-- bit-chip-select end-->
-
       <bit-table-scroll [dataSource]="dataSource" [rowSize]="75">
         <ng-container header *ngIf="!isAdminConsoleActive">
           <th bitCell></th>
diff --git a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.html b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.html
index 3389bc5ea19..717ef5ac24c 100644
--- a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.html
@@ -19,33 +19,30 @@
         {{ "unsecuredWebsitesFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
       </bit-callout>
 
-      @if (!isAdminConsoleActive && canDisplayToggleGroup()) {
-        <bit-toggle-group
-          *ngIf="showFilterToggle && !isAdminConsoleActive"
-          [selected]="filterOrgStatus$ | async"
-          (selectedChange)="filterOrgToggle($event)"
-          [attr.aria-label]="'addAccessFilter' | i18n"
-        >
-          <ng-container *ngFor="let status of filterStatus">
-            <bit-toggle [value]="status">
-              {{ getName(status) }}
-              <span bitBadge variant="info"> {{ getCount(status) }} </span>
-            </bit-toggle>
-          </ng-container>
-        </bit-toggle-group>
+      @if (showFilterToggle && !isAdminConsoleActive) {
+        @if (canDisplayToggleGroup()) {
+          <bit-toggle-group
+            [selected]="filterOrgStatus$ | async"
+            (selectedChange)="filterOrgToggle($event)"
+            [attr.aria-label]="'addAccessFilter' | i18n"
+          >
+            <ng-container *ngFor="let status of filterStatus">
+              <bit-toggle [value]="status">
+                {{ getName(status) }}
+                <span bitBadge variant="info"> {{ getCount(status) }} </span>
+              </bit-toggle>
+            </ng-container>
+          </bit-toggle-group>
+        } @else {
+          <bit-chip-select
+            [placeholderText]="chipSelectOptions[0].label"
+            [options]="chipSelectOptions"
+            [ngModel]="selectedFilterChip"
+            (ngModelChange)="filterOrgToggleChipSelect($event)"
+            fullWidth="true"
+          ></bit-chip-select>
+        }
       }
-
-      <!-- bit-chip-select start -->
-      @if (!isAdminConsoleActive && !canDisplayToggleGroup()) {
-        <bit-chip-select
-          [placeholderText]="chipSelectOptions[0].label"
-          [options]="chipSelectOptions"
-          [ngModel]="selectedFilterChip"
-          (ngModelChange)="filterOrgToggleChipSelect($event)"
-          fullWidth="true"
-        ></bit-chip-select>
-      }
-      <!-- bit-chip-select end-->
       <bit-table [dataSource]="dataSource">
         <ng-container header *ngIf="!isAdminConsoleActive">
           <tr bitRow>
diff --git a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html
index a182683038f..96bae4c3e0a 100644
--- a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html
@@ -19,34 +19,31 @@
         {{ "weakPasswordsFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
       </bit-callout>
 
-      @if (!isAdminConsoleActive && canDisplayToggleGroup()) {
-        <bit-toggle-group
-          *ngIf="showFilterToggle && !isAdminConsoleActive"
-          [selected]="filterOrgStatus$ | async"
-          (selectedChange)="filterOrgToggle($event)"
-          [attr.aria-label]="'addAccessFilter' | i18n"
-        >
-          <ng-container *ngFor="let status of filterStatus">
-            <bit-toggle [value]="status">
-              {{ getName(status) }}
-              <span bitBadge variant="info"> {{ getCount(status) }} </span>
-            </bit-toggle>
-          </ng-container>
-        </bit-toggle-group>
+      @if (showFilterToggle && !isAdminConsoleActive) {
+        @if (canDisplayToggleGroup()) {
+          <bit-toggle-group
+            [selected]="filterOrgStatus$ | async"
+            (selectedChange)="filterOrgToggle($event)"
+            [attr.aria-label]="'addAccessFilter' | i18n"
+          >
+            <ng-container *ngFor="let status of filterStatus">
+              <bit-toggle [value]="status">
+                {{ getName(status) }}
+                <span bitBadge variant="info"> {{ getCount(status) }} </span>
+              </bit-toggle>
+            </ng-container>
+          </bit-toggle-group>
+        } @else {
+          <bit-chip-select
+            [placeholderText]="chipSelectOptions[0].label"
+            [options]="chipSelectOptions"
+            [ngModel]="selectedFilterChip"
+            (ngModelChange)="filterOrgToggleChipSelect($event)"
+            fullWidth="true"
+          ></bit-chip-select>
+        }
       }
 
-      <!-- bit-chip-select start -->
-      @if (!isAdminConsoleActive && !canDisplayToggleGroup()) {
-        <bit-chip-select
-          [placeholderText]="chipSelectOptions[0].label"
-          [options]="chipSelectOptions"
-          [ngModel]="selectedFilterChip"
-          (ngModelChange)="filterOrgToggleChipSelect($event)"
-          fullWidth="true"
-        ></bit-chip-select>
-      }
-      <!-- bit-chip-select end-->
-
       <bit-table-scroll [dataSource]="dataSource" [rowSize]="75">
         <ng-container header>
           <th bitCell></th>