diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 41be86e584e..09dac7f4c48 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitwarden/server
+FROM ghcr.io/bitwarden/server
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
index 489f42649f9..e9122864447 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -219,23 +219,24 @@ export class VaultHeaderComponent implements OnInit {
   }
 
   async addCollection(): Promise<void> {
-    const organization = this.organizations?.find(
-      (org) => org.productTierType === ProductTierType.Free,
-    );
     const isBreadcrumbEventLogsEnabled = await firstValueFrom(
       this.configService.getFeatureFlag$(FeatureFlag.PM12276_BreadcrumbEventLogs),
     );
-    if (
-      this.organizations.length == 1 &&
-      organization.productTierType === ProductTierType.Free &&
-      isBreadcrumbEventLogsEnabled
-    ) {
-      const collections = await this.collectionAdminService.getAll(organization.id);
-      if (collections.length === organization.maxCollections) {
-        await this.showFreeOrgUpgradeDialog(organization);
-        return;
+
+    if (isBreadcrumbEventLogsEnabled) {
+      const organization = this.organizations?.find(
+        (org) => org.productTierType === ProductTierType.Free,
+      );
+
+      if (this.organizations?.length == 1 && !!organization) {
+        const collections = await this.collectionAdminService.getAll(organization.id);
+        if (collections.length === organization.maxCollections) {
+          await this.showFreeOrgUpgradeDialog(organization);
+          return;
+        }
       }
     }
+
     this.onAddCollection.emit();
   }
 
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 4ba234bed0c..3ddc139ee34 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1359,7 +1359,7 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultSetPasswordJitService,
     deps: [
       ApiServiceAbstraction,
-      MasterPasswordApiService,
+      MasterPasswordApiServiceAbstraction,
       KeyService,
       EncryptService,
       I18nServiceAbstraction,
diff --git a/package-lock.json b/package-lock.json
index 52d525f08a5..eaf5c0f24ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@angular/platform-browser": "18.2.13",
         "@angular/platform-browser-dynamic": "18.2.13",
         "@angular/router": "18.2.13",
-        "@bitwarden/sdk-internal": "0.2.0-main.107",
+        "@bitwarden/sdk-internal": "0.2.0-main.124",
         "@electron/fuses": "1.8.0",
         "@emotion/css": "11.13.5",
         "@koa/multer": "3.0.2",
@@ -4698,10 +4698,9 @@
       "link": true
     },
     "node_modules/@bitwarden/sdk-internal": {
-      "version": "0.2.0-main.107",
-      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.107.tgz",
-      "integrity": "sha512-xpOF6NAS0/em3jFBv4FI1ASy1Nuc7I1v41TVmG56wS+80y+NH1RnfGjp+a+XiO7Xxh3jssrxmjzihJjWQQA0rg==",
-      "license": "GPL-3.0"
+      "version": "0.2.0-main.124",
+      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.124.tgz",
+      "integrity": "sha512-7F+DlPFng/thT4EVIQk2tRC7kff6G2B7alHAIxBdioJc9vE64Z5R5pviUyMZzqLnA5e9y8EnQdtWsQzUkHxisQ=="
     },
     "node_modules/@bitwarden/send-ui": {
       "resolved": "libs/tools/send/send-ui",
diff --git a/package.json b/package.json
index 4886fe9a90d..943fde5fcf3 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "@angular/platform-browser": "18.2.13",
     "@angular/platform-browser-dynamic": "18.2.13",
     "@angular/router": "18.2.13",
-    "@bitwarden/sdk-internal": "0.2.0-main.107",
+    "@bitwarden/sdk-internal": "0.2.0-main.124",
     "@electron/fuses": "1.8.0",
     "@emotion/css": "11.13.5",
     "@koa/multer": "3.0.2",