diff --git a/apps/web/src/app/components/organization-switcher.component.html b/apps/web/src/app/components/organization-switcher.component.html
index ca3995bf46..235dcf713b 100644
--- a/apps/web/src/app/components/organization-switcher.component.html
+++ b/apps/web/src/app/components/organization-switcher.component.html
@@ -6,7 +6,7 @@
     [appA11yTitle]="'organizationPicker' | i18n"
     [bitMenuTriggerFor]="orgPickerMenu"
   >
-    <bit-avatar [text]="activeOrganization.name" [id]="activeOrganization.id"></bit-avatar>
+    <bit-avatar [text]="activeOrganization.name"></bit-avatar>
     <div class="tw-flex">
       <div class="org-name tw-ml-3">
         <span>{{ activeOrganization.name }}</span>
diff --git a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
index 33c659be55..bddba952b8 100644
--- a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
+++ b/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
@@ -38,7 +38,7 @@ export class OrganizationNameBadgeComponent implements OnInit {
         this.color = Utils.stringToColor(userName.toUpperCase());
       }
     } else {
-      this.color = Utils.stringToColor(this.organizationName);
+      this.color = Utils.stringToColor(this.organizationName.toUpperCase());
     }
     this.textColor = Utils.pickTextColorBasedOnBgColor(this.color, 135, true) + "!important";
   }