diff --git a/.eslintrc.json b/.eslintrc.json
index d6c329a94dc..44b4e09adf2 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -179,6 +179,23 @@
       "rules": {
         "no-restricted-imports": ["error", { "patterns": ["@bitwarden/vault/*", "src/**/*"] }]
       }
+    },
+    {
+      "files": ["apps/browser/src/**/*.ts", "libs/**/*.ts"],
+      "excludedFiles": "apps/browser/src/autofill/{content,notification}/**/*.ts",
+      "rules": {
+        "no-restricted-syntax": [
+          "error",
+          {
+            "message": "Using addListener in the browser popup produces a memory leak in Safari, use `BrowserApi.messageListener` instead",
+            "selector": "CallExpression > [object.object.object.name='chrome'][object.object.property.name='runtime'][object.property.name='onMessage'][property.name='addListener']"
+          },
+          {
+            "message": "Using addListener in the browser popup produces a memory leak in Safari, use `BrowserApi.storageChangeListener` instead",
+            "selector": "CallExpression > [object.object.object.name='chrome'][object.object.property.name='storage'][object.property.name='onChanged'][property.name='addListener']"
+          }
+        ]
+      }
     }
   ]
 }
diff --git a/.github/workflows/brew-bump-cli.yml b/.github/workflows/brew-bump-cli.yml
index d2e998eacb0..8273ab00e80 100644
--- a/.github/workflows/brew-bump-cli.yml
+++ b/.github/workflows/brew-bump-cli.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "brew-bump-workflow-pat"
diff --git a/.github/workflows/brew-bump-desktop.yml b/.github/workflows/brew-bump-desktop.yml
index 1856cc5fb82..4032f5883a0 100644
--- a/.github/workflows/brew-bump-desktop.yml
+++ b/.github/workflows/brew-bump-desktop.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "brew-bump-workflow-pat"
diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 57c2fdcef07..f2441c79536 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -58,7 +58,11 @@ jobs:
     outputs:
       repo_url: ${{ steps.gen_vars.outputs.repo_url }}
       adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }}
+      node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+
       - name: Get Package Version
         id: gen_vars
         run: |
@@ -68,6 +72,14 @@ jobs:
           echo "repo_url=$repo_url" >> $GITHUB_OUTPUT
           echo "adj_build_number=$adj_build_num" >> $GITHUB_OUTPUT
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        working-directory: ./
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
 
   locales-test:
     name: Locales Test
@@ -114,6 +126,7 @@ jobs:
       - locales-test
     env:
       _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -123,7 +136,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Install node-gyp
         run: |
@@ -251,6 +264,7 @@ jobs:
       - locales-test
     env:
       _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -260,7 +274,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Print environment
         run: |
@@ -361,7 +375,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token"
@@ -423,7 +437,7 @@ jobs:
       - name: Retrieve secrets
         id: retrieve-secrets
         if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "devops-alerts-slack-webhook-url"
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index 9fa71cb24fe..ffffdccb8a7 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -53,17 +53,26 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      package_version: ${{ steps.retrieve-version.outputs.package_version }}
+      package_version: ${{ steps.retrieve-package-version.outputs.package_version }}
+      node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Get Package Version
-        id: retrieve-version
+        id: retrieve-package-version
         run: |
           PKG_VERSION=$(jq -r .version package.json)
           echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        working-directory: ./
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
 
   cli:
     name: Build CLI ${{ matrix.os }}
@@ -75,6 +84,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       _WIN_PKG_FETCH_VERSION: 18.5.0
       _WIN_PKG_VERSION: 3.4
     steps:
@@ -92,7 +102,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Install node-gyp
         run: |
@@ -149,6 +159,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       _WIN_PKG_FETCH_VERSION: 18.5.0
       _WIN_PKG_VERSION: 3.4
     steps:
@@ -166,7 +177,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Install node-gyp
         run: |
@@ -404,7 +415,7 @@ jobs:
       - name: Retrieve secrets
         id: retrieve-secrets
         if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "devops-alerts-slack-webhook-url"
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 6db1e59a3fa..8b0482c3671 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -78,6 +78,7 @@ jobs:
       build_number: ${{ steps.increment-version.outputs.build_number }}
       rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
+      node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -130,6 +131,13 @@ jobs:
             echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
           fi
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        working-directory: ./
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
 
   linux:
     name: Linux Build
@@ -138,6 +146,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -150,7 +159,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -257,6 +266,7 @@ jobs:
         working-directory: apps/desktop
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -266,7 +276,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@@ -277,7 +287,7 @@ jobs:
           node-gyp install $(node -v)
 
       - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/install-ast@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
 
       - name: Set up environmentF
         run: choco install checksum --no-progress
@@ -302,7 +312,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "code-signing-vault-url,
@@ -467,6 +477,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -479,7 +490,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -619,6 +630,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -631,7 +643,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -816,6 +828,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -828,7 +841,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -1005,6 +1018,7 @@ jobs:
       - setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -1017,7 +1031,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -1190,7 +1204,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token"
@@ -1269,7 +1283,7 @@ jobs:
       - name: Retrieve secrets
         id: retrieve-secrets
         if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "devops-alerts-slack-webhook-url"
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index f5458448465..d0360b4a4ed 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -57,6 +57,7 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.version.outputs.value }}
+      node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -65,12 +66,20 @@ jobs:
         id: version
         run: echo "value=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
   build-artifacts:
     name: Build artifacts
     runs-on: ubuntu-22.04
     needs: setup
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     strategy:
       matrix:
         include:
@@ -98,7 +107,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: "16"
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Print environment
         run: |
@@ -188,7 +197,7 @@ jobs:
 
       - name: Retrieve github PAT secrets
         id: retrieve-secret-pat
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "github-pat-bitwarden-devops-bot-repo-scope"
@@ -264,7 +273,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token"
@@ -325,7 +334,7 @@ jobs:
       - name: Retrieve secrets
         id: retrieve-secrets
         if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "devops-alerts-slack-webhook-url"
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 7f6d5cc11c4..ccaf9a1a6a0 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -12,16 +12,23 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
-        with:
-          node-version: "16"
-
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           fetch-depth: 0
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Set up Node
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
+
       - name: Cache npm
         id: npm-cache
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -31,7 +38,7 @@ jobs:
 
       - name: Install Node dependencies
         run: npm ci
-      
+
       # Manual build the storybook to resolve a chromatic/storybook bug related to TurboSnap
       - name: Build Storybook
         run: npm run build-storybook:ci
diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml
index d14938cc468..0ff79d68296 100644
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -32,13 +32,13 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Download translations
-        uses: bitwarden/gh-actions/crowdin@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/crowdin@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
diff --git a/.github/workflows/deploy-eu-prod-web.yml b/.github/workflows/deploy-eu-prod-web.yml
index 523e0f44de7..aeb5d2c0197 100644
--- a/.github/workflows/deploy-eu-prod-web.yml
+++ b/.github/workflows/deploy-eu-prod-web.yml
@@ -24,13 +24,13 @@ jobs:
 
       - name: Retrieve Storage Account connection string
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: webvault-westeurope-prod
           secrets: "sa-bitwarden-web-vault-dev-key-temp"
 
       - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: apps/web
diff --git a/.github/workflows/deploy-eu-qa-web.yml b/.github/workflows/deploy-eu-qa-web.yml
index 2a1e271f18b..0b71fbc9981 100644
--- a/.github/workflows/deploy-eu-qa-web.yml
+++ b/.github/workflows/deploy-eu-qa-web.yml
@@ -24,13 +24,13 @@ jobs:
 
       - name: Retrieve Storage Account connection string
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: webvaulteu-westeurope-qa
           secrets: "sa-bitwarden-web-vault-dev-key-temp"
 
       - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: apps/web
diff --git a/.github/workflows/deploy-non-prod-web.yml b/.github/workflows/deploy-non-prod-web.yml
index 78e0f12b7e9..8e5b8f5c9f3 100644
--- a/.github/workflows/deploy-non-prod-web.yml
+++ b/.github/workflows/deploy-non-prod-web.yml
@@ -67,7 +67,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: apps/web
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a3c3efdd19d..0e8de8f1962 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -38,12 +38,19 @@ jobs:
             > tmp.txt
           diff <(sort .github/whitelist-capital-letters.txt) <(sort tmp.txt)
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
       - name: Set up Node
         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
 
       - name: Run linter
         run: |
diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml
index 5fd9441f14a..32cf8d18546 100644
--- a/.github/workflows/release-browser.yml
+++ b/.github/workflows/release-browser.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/release-version-check@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: ts
@@ -103,7 +103,7 @@ jobs:
 
       - name: Download latest Release build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
@@ -116,7 +116,7 @@ jobs:
 
       - name: Dry Run - Download latest master build artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 7c21cafcfd1..04a8a04f4f5 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/release-version-check@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: ts
@@ -78,7 +78,7 @@ jobs:
 
       - name: Download all Release artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli
@@ -87,7 +87,7 @@ jobs:
 
       - name: Dry Run - Download all artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli
@@ -150,19 +150,17 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "snapcraft-store-token"
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641  # v2.1.1
-        with:
-          snapcraft_token: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
 
       - name: Download artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli
@@ -172,7 +170,7 @@ jobs:
 
       - name: Dry Run - Download artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli
@@ -185,7 +183,7 @@ jobs:
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          snapcraft push bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft upload bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
           snapcraft logout
 
   choco:
@@ -206,7 +204,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "cli-choco-api-key"
@@ -222,7 +220,7 @@ jobs:
 
       - name: Download artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli/dist
@@ -232,7 +230,7 @@ jobs:
 
       - name: Dry Run - Download artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli/dist
@@ -265,14 +263,14 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "npm-api-key"
 
       - name: Download artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli/build
@@ -282,7 +280,7 @@ jobs:
 
       - name: Dry Run - Download artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-cli.yml
           path: apps/cli/build
diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml
index ce09a7d80ad..b2e568632b5 100644
--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -21,6 +21,7 @@ jobs:
       release-channel: ${{ steps.release-channel.outputs.channel }}
       branch-name: ${{ steps.branch.outputs.branch-name }}
       build_number: ${{ steps.increment-version.outputs.build_number }}
+      node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -47,7 +48,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/release-version-check@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           release-type: 'Initial Release'
           project-type: ts
@@ -104,12 +105,20 @@ jobs:
 
           echo "branch-name=$branch_name" >> $GITHUB_OUTPUT
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
   linux:
     name: Linux Build
     runs-on: ubuntu-20.04
     needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -124,7 +133,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -209,6 +218,7 @@ jobs:
         working-directory: apps/desktop
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -220,7 +230,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@@ -231,7 +241,7 @@ jobs:
           node-gyp install $(node -v)
 
       - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/install-ast@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
 
       - name: Set up environment
         run: choco install checksum --no-progress
@@ -249,7 +259,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "code-signing-vault-url,
@@ -401,6 +411,7 @@ jobs:
     needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -415,7 +426,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -530,6 +541,7 @@ jobs:
       - macos-build
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -544,7 +556,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -732,6 +744,7 @@ jobs:
       - macos-build
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     defaults:
       run:
         working-directory: apps/desktop
@@ -746,7 +759,7 @@ jobs:
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ env._NODE_VERSION }}
 
       - name: Set Node options
         run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@@ -932,7 +945,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "aws-electron-access-id,
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index f60020c7327..b9ffa80e512 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -67,7 +67,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/release-version-check@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           release-type: ${{ inputs.release_type }}
           project-type: ts
@@ -110,7 +110,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "aws-electron-access-id,
@@ -123,7 +123,7 @@ jobs:
 
       - name: Download all artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
@@ -132,7 +132,7 @@ jobs:
 
       - name: Dry Run - Download all artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
@@ -185,7 +185,7 @@ jobs:
           --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com
 
       - name: Get checksum files
-        uses: bitwarden/gh-actions/get-checksum@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-checksum@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           packages_dir: "apps/desktop/artifacts"
           file_path: "apps/desktop/artifacts/sha256-checksums.txt"
@@ -263,15 +263,13 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "snapcraft-store-token"
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641 # v2.1.1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
 
       - name: Setup
         run: mkdir dist
@@ -279,7 +277,7 @@ jobs:
 
       - name: Download Snap artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
@@ -289,7 +287,7 @@ jobs:
 
       - name: Dry Run - Download Snap artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
@@ -302,8 +300,8 @@ jobs:
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          /snap/bin/snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
-          /snap/bin/snapcraft logout
+          snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft logout
         working-directory: apps/desktop/dist
 
   choco:
@@ -329,7 +327,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "cli-choco-api-key"
@@ -347,7 +345,7 @@ jobs:
 
       - name: Download choco artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
@@ -357,7 +355,7 @@ jobs:
 
       - name: Dry Run - Download choco artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-desktop.yml
           workflow_conclusion: success
diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml
index 46113b94b40..cbf83dc9cdf 100644
--- a/.github/workflows/release-web.yml
+++ b/.github/workflows/release-web.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/release-version-check@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: ts
@@ -130,7 +130,7 @@ jobs:
 
       - name: Retrieve bot secrets
         id: retrieve-bot-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: bitwarden-ci
           secrets: "github-pat-bitwarden-devops-bot-repo-scope"
@@ -144,7 +144,7 @@ jobs:
 
       - name: Download latest cloud asset
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: assets
@@ -154,7 +154,7 @@ jobs:
 
       - name: Dry Run - Download latest cloud asset
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: assets
@@ -227,7 +227,7 @@ jobs:
 
       - name: Download latest build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: apps/web/artifacts
@@ -238,7 +238,7 @@ jobs:
 
       - name: Dry Run - Download latest build artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/download-artifacts@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           workflow: build-web.yml
           path: apps/web/artifacts
diff --git a/.github/workflows/staged-rollout-desktop.yml b/.github/workflows/staged-rollout-desktop.yml
index b0c57e1a1be..a3eacb868fd 100644
--- a/.github/workflows/staged-rollout-desktop.yml
+++ b/.github/workflows/staged-rollout-desktop.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "aws-electron-access-id,
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55363a329ea..59f52bd1964 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,12 +27,19 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+
       - name: Set up Node
         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-          node-version: '18'
+          node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
 
       - name: Print environment
         run: |
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
index f50a6fe6cd5..14755097b0e 100644
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           keyvault: "bitwarden-ci"
           secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
@@ -125,14 +125,14 @@ jobs:
 
       - name: Bump Browser Version - Manifest
         if: ${{ inputs.bump_browser == true }}
-        uses: bitwarden/gh-actions/version-bump@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/version-bump@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           version: ${{ inputs.version_number }}
           file_path: "apps/browser/src/manifest.json"
 
       - name: Bump Browser Version - Manifest v3
         if: ${{ inputs.bump_browser == true }}
-        uses: bitwarden/gh-actions/version-bump@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+        uses: bitwarden/gh-actions/version-bump@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
         with:
           version: ${{ inputs.version_number }}
           file_path: "apps/browser/src/manifest.v3.json"
diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml
index f38d228dda6..49388c11f82 100644
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@62d1bf7c3e31c458cc7236b1e69a475d235cd78f
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@f1125802b1ccae8c601d7c4f61ce39ea254b10c8
diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index ba917a9e681..c3ba5c4a950 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "التعبئة التلقائية"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "إنشاء كلمة مرور (تم النسخ)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "لا توجد تسجيلات دخول مطابقة."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "افتح خزنتك"
   },
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index b784592a3b0..483dc2c14f1 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Avto-doldurma"
   },
+  "autoFillLogin": {
+    "message": "Giriş avto-doldurma"
+  },
+  "autoFillCard": {
+    "message": "Kart avto-doldurma"
+  },
+  "autoFillIdentity": {
+    "message": "Kimlik avto-doldurma"
+  },
   "generatePasswordCopied": {
     "message": "Parol yarat (kopyalandı)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Uyğun gələn hesab yoxdur."
   },
+  "noCards": {
+    "message": "Kart yoxdur"
+  },
+  "noIdentities": {
+    "message": "Kimlik yoxdur"
+  },
+  "addLoginMenu": {
+    "message": "Giriş əlavə et"
+  },
+  "addCardMenu": {
+    "message": "Kart əlavə et"
+  },
+  "addIdentityMenu": {
+    "message": "Kimlik əlavə et"
+  },
   "unlockVaultMenu": {
     "message": "Anbarın kilidini açın"
   },
@@ -671,7 +695,7 @@
     "description": "'Solarized' is a noun and the name of a color scheme. It should not be translated."
   },
   "exportVault": {
-    "message": "Anbarı ixrac et"
+    "message": "Anbarı xaricə köçür"
   },
   "fileFormat": {
     "message": "Fayl formatı"
@@ -681,19 +705,19 @@
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "confirmVaultExport": {
-    "message": "Anbarın ixracını təsdiqləyin"
+    "message": "Anbarın xaricə köçürülməsini təsdiqləyin"
   },
   "exportWarningDesc": {
-    "message": "Bu ixrac faylındakı anbar verilənləriniz şifrələnməmiş formatdadır. İxrac edilən faylı, güvənli olmayan kanallar üzərində saxlamamalı və ya göndərməməlisiniz (e-poçt kimi). Bu faylı işiniz bitdikdən sonra dərhal silin."
+    "message": "Xaricə köçürdüyünüz bu fayldakı datanız şifrələnməmiş formatdadır. Bu faylı güvənli olmayan kanallar (e-poçt kimi) üzərində saxlamamalı və ya göndərməməlisiniz. İşiniz bitdikdən sonra faylı dərhal silin."
   },
   "encExportKeyWarningDesc": {
-    "message": "Bu ixrac faylı, hesabınızın şifrələmə açarını istifadə edərək verilənlərinizi şifrələyir. Hesabınızın şifrələmə açarını döndərsəniz, bu ixrac faylının şifrəsini aça bilməyəcəyiniz üçün yenidən ixrac etməli olacaqsınız."
+    "message": "Xaricə köçürdüyünüz bu fayldakı data, hesabınızın şifrələmə açarı istifadə edilərək şifrələnir. Hesabınızın şifrələmə açarını dəyişdirsəniz, bu faylın şifrəsini aça bilməyəcəksiniz və onu yenidən xaricə köçürməli olacaqsınız."
   },
   "encExportAccountWarningDesc": {
     "message": "Hesab şifrələmə açarları, hər Bitwarden istifadəçi hesabı üçün unikaldır, buna görə də şifrələnmiş bir ixracı, fərqli bir hesaba idxal edə bilməzsiniz."
   },
   "exportMasterPassword": {
-    "message": "Anbar verilənlərinizi ixrac etmək üçün ana parolunuzu daxil edin."
+    "message": "Anbar datanızı xaricə köçürmək üçün ana parolunuzu daxil edin."
   },
   "shared": {
     "message": "Paylaşılan"
@@ -799,7 +823,7 @@
     "message": "YubiKey və Duo kimi mülkiyyətçi iki addımlı giriş seçimləri."
   },
   "ppremiumSignUpReports": {
-    "message": "Anbarınızın təhlükəsiyini təmin etmək üçün parol gigiyenası, hesab sağlamlığı və verilənlərin pozulması hesabatları."
+    "message": "Anbarınızın təhlükəsizliyini təmin etmək üçün parol gigiyenası, hesab sağlamlığı və data pozuntusu hesabatları."
   },
   "ppremiumSignUpTotp": {
     "message": "Anbarınızdakı hesablar üçün TOTP təsdiqləmə kodu (2FA) yaradıcısı."
@@ -2408,18 +2432,18 @@
     "description": "Toggling an expand/collapse state."
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Domen ləqəbi"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
+    "message": "\"Ana parolu təkrar soruş\" özəlliyi olan elementlər səhifə yüklənəndə avto-doldurulmur. \"Səhifə yüklənəndə avto-doldurma\" özəlliyi söndürülüb.",
     "description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load."
   },
   "autofillOnPageLoadSetToDefault": {
-    "message": "Auto-fill on page load set to use default setting.",
+    "message": "\"Səhifə yüklənəndə avto-doldurma\" özəlliyi ilkin tənzimləməni istifadə etmək üzrə tənzimləndi.",
     "description": "Toast message for informing the user that auto-fill on page load has been set to the default setting."
   },
   "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
+    "message": "Bu sahəyə düzəliş etmək üçün \"Ana parolu təkrar soruş\"u söndürün",
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   }
 }
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index e941d525936..d0c1bac2bb7 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Аўтазапаўненне"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Генерыраваць пароль (з капіяваннем)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Няма адпаведных лагінаў."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Разблакіраваць сховішча"
   },
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index 08451607d2b..75d86dd2b41 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -14,7 +14,7 @@
     "message": "Впишете се или създайте нов абонамент, за да достъпите защитен трезор."
   },
   "createAccount": {
-    "message": "Създаване на абонамент"
+    "message": "Създаване на акаунт"
   },
   "login": {
     "message": "Вписване"
@@ -83,7 +83,7 @@
     "message": "Копиране на потребителското име"
   },
   "copyNumber": {
-    "message": "Копиране на номера"
+    "message": "Копиране на но̀мера"
   },
   "copySecurityCode": {
     "message": "Копиране на кода за сигурност"
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Автоматично дописване"
   },
+  "autoFillLogin": {
+    "message": "Авт. попълване на данни за вход"
+  },
+  "autoFillCard": {
+    "message": "Самопопълваща се карта"
+  },
+  "autoFillIdentity": {
+    "message": "Самопопълваща се самоличност"
+  },
   "generatePasswordCopied": {
     "message": "Генериране на парола (копирана)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Няма съвпадащи записи."
   },
+  "noCards": {
+    "message": "Няма карти"
+  },
+  "noIdentities": {
+    "message": "Няма самоличности"
+  },
+  "addLoginMenu": {
+    "message": "Добавяне на запис за вход"
+  },
+  "addCardMenu": {
+    "message": "Добавяне на карта"
+  },
+  "addIdentityMenu": {
+    "message": "Добавяне на самоличност"
+  },
   "unlockVaultMenu": {
     "message": "Отключете трезора си"
   },
@@ -233,7 +257,7 @@
     "message": "Избор"
   },
   "generatePassword": {
-    "message": "Генериране на парола"
+    "message": "Нова парола"
   },
   "regeneratePassword": {
     "message": "Регенериране на паролата"
@@ -467,7 +491,7 @@
     "message": "Грешен код за потвърждаване"
   },
   "valueCopied": {
-    "message": "$VALUE$ — копирано",
+    "message": "Копирано е $VALUE$",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
@@ -537,7 +561,7 @@
     "message": "Копирана парола"
   },
   "uri": {
-    "message": "Адрес"
+    "message": "Унифициран идентификатор на ресурс"
   },
   "uriPosition": {
     "message": "Адрес $POSITION$",
@@ -550,7 +574,7 @@
     }
   },
   "newUri": {
-    "message": "Нов адрес"
+    "message": "Нов унифициран идентификатор на ресурс"
   },
   "addedItem": {
     "message": "Елементът е добавен"
@@ -631,7 +655,7 @@
     "message": "Да се обнови ли паролата в Bitwarden?"
   },
   "notificationChangeSave": {
-    "message": "Да, нека се обнови сега"
+    "message": "Осъвременяване"
   },
   "notificationUnlockDesc": {
     "message": "Отключете трезора си в Битуорден, за да завършите заявката за автоматично попълване."
@@ -684,7 +708,7 @@
     "message": "Потвърждаване на изнасянето на трезора"
   },
   "exportWarningDesc": {
-    "message": "Данните от трезора ви ще се изнесат в незащитен формат. Не го пращайте по незащитени канали като е-поща. Изтрийте файла незабавно след като свършите работата си с него."
+    "message": "Този износ съдържа данни на трезора ви в некриптиран формат. Не трябва да съхранявате или изпращате износния файл през незащитени канали (като имейл). Изтрийте файла моментално след като свършите работата си с него."
   },
   "encExportKeyWarningDesc": {
     "message": "При изнасяне данните се шифрират с ключа ви. Ако го смените, ще трябва наново да ги изнесете, защото няма да може да дешифрирате настоящия файл."
@@ -699,10 +723,10 @@
     "message": "Споделено"
   },
   "learnOrg": {
-    "message": "Разберете повече за организациите"
+    "message": "Научете за организациите"
   },
   "learnOrgConfirmation": {
-    "message": "Битуорден позволява да споделяте части от трезора си чрез използването на организация. Искате ли да научите повече от сайта bitwarden.com?"
+    "message": "Битуорден позволява да споделяте елементи от трезора си а други, използвайки организация. Бихте ли посетили сайта bitwarden.com, за да научите повече?"
   },
   "moveToOrganization": {
     "message": "Преместване в организация"
@@ -781,7 +805,7 @@
     "message": "Управление на абонамента"
   },
   "premiumManageAlert": {
-    "message": "Можете да управлявате абонамента си през сайта bitwarden.com. Искате ли да го посетите сега?"
+    "message": "Може да управлявате членството си в мрежата на трезора в bitwarden.com. Искате ли да посетите уебсайта сега?"
   },
   "premiumRefresh": {
     "message": "Опресняване на абонамента"
@@ -901,7 +925,7 @@
     "message": "Регистрацията е защитена с двустепенно удостоверяване, но никой от настроените доставчици на удостоверяване не се поддържа от този браузър."
   },
   "noTwoStepProviders2": {
-    "message": "Пробвайте с поддържан уеб браузър (като Chrome или Firefox) и други доставчици на удостоверяване, които се поддържат от браузърите (като специални програми за удостоверяване)."
+    "message": "Употребявайте поддържан браузър (като Chrome, Firefox) и/или добавете други доставчици на удостоверяване, които се поддържат по-добре от браузърите (като специални програми за удостоверяване)."
   },
   "twoStepOptions": {
     "message": "Настройки на двустепенното удостоверяване"
@@ -920,10 +944,10 @@
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
-    "message": "Устройство YubiKey OTP"
+    "message": "Ключ за сигурност YubiKey OTP"
   },
   "yubiKeyDesc": {
-    "message": "Използвайте устройство на YubiKey, за да влезете в абонамента си. Поддържат се моделите YubiKey 4, 4 Nano, 4C и NEO."
+    "message": "Използвайте ключа за сигурност YubiKey, за да влезете в акаунта си. Работи с устройствата YubiKey 4, 4 Nano, 4C и NEO."
   },
   "duoDesc": {
     "message": "Удостоверяване чрез Duo Security, с ползване на приложението Duo Mobile, SMS, телефонен разговор или устройство U2F.",
@@ -2096,7 +2120,7 @@
     "message": "собствен хостинг"
   },
   "thirdParty": {
-    "message": "Third-party"
+    "message": "Трета страна"
   },
   "thirdPartyServerMessage": {
     "message": "Connected to third-party server implementation, $SERVERNAME$. Please verify bugs using the official server, or report them to the third-party server.",
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index edee2852116..f8c5fb8c85b 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "স্বতঃপূরণ"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "পাসওয়ার্ড তৈরি করুন (অনুলিপিকৃত)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "কোনও মিলত লগইন নেই।"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index e984a88b7bc..d5d1bbb16a6 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index 7839cceebcb..af85e586c80 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Emplenament automàtic"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Genera contrasenya (copiada)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No hi ha inicis de sessió coincidents."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "1. Desbloquegeu la caixa forta."
   },
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index 71446db9f2c..e9b3bf997cd 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automatické vyplňování"
   },
+  "autoFillLogin": {
+    "message": "Automaticky vyplnit přihlášení"
+  },
+  "autoFillCard": {
+    "message": "Automaticky vyplnit kartu"
+  },
+  "autoFillIdentity": {
+    "message": "Automaticky vyplnit identitu"
+  },
   "generatePasswordCopied": {
     "message": "Vygenerovat heslo a zkopírovat do schránky"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Žádné odpovídající přihlašovací údaje"
   },
+  "noCards": {
+    "message": "Žádné karty"
+  },
+  "noIdentities": {
+    "message": "Žádné identity"
+  },
+  "addLoginMenu": {
+    "message": "Přidat přihlašovací údaje"
+  },
+  "addCardMenu": {
+    "message": "Přidat kartu"
+  },
+  "addIdentityMenu": {
+    "message": "Přidat identitu"
+  },
   "unlockVaultMenu": {
     "message": "Odemknout Váš trezor"
   },
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index 7292370f533..ff3ccc684f7 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Llenwi'n awtomatig"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Cynhyrchu cyfrinair (wedi'i gopïo)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Datgloi'ch cell"
   },
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index 1bc0ed79e5a..5dd437827f3 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-udfyld"
   },
+  "autoFillLogin": {
+    "message": "Autoudfyld login"
+  },
+  "autoFillCard": {
+    "message": "Autoudfyld kort"
+  },
+  "autoFillIdentity": {
+    "message": "Autoudfyld identitet"
+  },
   "generatePasswordCopied": {
     "message": "Generér adgangskode (kopieret)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Ingen matchende logins"
   },
+  "noCards": {
+    "message": "Ingen kort"
+  },
+  "noIdentities": {
+    "message": "Ingen identiteter"
+  },
+  "addLoginMenu": {
+    "message": "Tilføj login"
+  },
+  "addCardMenu": {
+    "message": "Tilføj kort"
+  },
+  "addIdentityMenu": {
+    "message": "Tilføj identitet"
+  },
   "unlockVaultMenu": {
     "message": "Lås din boks op"
   },
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index 443d4294cd3..3edd462918f 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-Ausfüllen"
   },
+  "autoFillLogin": {
+    "message": "Zugangsdaten automatisch ausfüllen"
+  },
+  "autoFillCard": {
+    "message": "Karte automatisch ausfüllen"
+  },
+  "autoFillIdentity": {
+    "message": "Identität automatisch ausfüllen"
+  },
   "generatePasswordCopied": {
     "message": "Passwort generieren (kopiert)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Keine passenden Zugangsdaten"
   },
+  "noCards": {
+    "message": "Keine Karten"
+  },
+  "noIdentities": {
+    "message": "Keine Identitäten"
+  },
+  "addLoginMenu": {
+    "message": "Zugangsdaten hinzufügen"
+  },
+  "addCardMenu": {
+    "message": "Karte hinzufügen"
+  },
+  "addIdentityMenu": {
+    "message": "Identität hinzufügen"
+  },
   "unlockVaultMenu": {
     "message": "Entsperre deinen Tresor"
   },
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index c0b349f8aff..2692a89b7db 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Αυτόματη συμπλήρωση"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Δημιουργία Κωδικού (αντιγράφηκε)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Δεν υπάρχουν αντιστοιχίσεις σύνδεσης."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Ξεκλειδώστε το vault σας"
   },
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index fbe9e4fc31e..4e1057956fa 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index 0ae234fbece..32dd196f2ae 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index 15f8b4fbefa..b81a05c9a4b 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Autorellenar"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generar contraseña (copiada)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Sin entradas coincidentes."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Desbloquea la caja fuerte"
   },
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index b799c3a63a3..4fe20767c0e 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automaatne täitmine"
   },
+  "autoFillLogin": {
+    "message": "Täida konto andmed"
+  },
+  "autoFillCard": {
+    "message": "Täida kaardi andmed"
+  },
+  "autoFillIdentity": {
+    "message": "Täida identiteet"
+  },
   "generatePasswordCopied": {
     "message": "Genereeri parool (kopeeritakse)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Sobivaid kontoandmeid ei leitud."
   },
+  "noCards": {
+    "message": "Kaardid puuduvad"
+  },
+  "noIdentities": {
+    "message": "Identiteedid puuduvad"
+  },
+  "addLoginMenu": {
+    "message": "Lisa konto andmed"
+  },
+  "addCardMenu": {
+    "message": "Lisa kaart"
+  },
+  "addIdentityMenu": {
+    "message": "Lisa identiteet"
+  },
   "unlockVaultMenu": {
     "message": "Lukusta hoidla lahti"
   },
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index 6290304cda6..291a687f8b4 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-betetzea"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Sortu pasahitza (kopiatuta)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Bat datozen saio-hasierarik gabe"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Desblokeatu kutxa gotorra"
   },
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index 250ca3631a5..c366c3a00b6 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "پر کردن خودکار"
   },
+  "autoFillLogin": {
+    "message": "پر کردن خودکار ورود"
+  },
+  "autoFillCard": {
+    "message": "پر کردن خودکار کارت"
+  },
+  "autoFillIdentity": {
+    "message": "پر کردن خودکار هویت"
+  },
   "generatePasswordCopied": {
     "message": "ساخت کلمه عبور (کپی شد)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "ورودی‌ها منتطبق نیست"
   },
+  "noCards": {
+    "message": "کارتی وجود ندارد"
+  },
+  "noIdentities": {
+    "message": "هویتی وجود ندارد"
+  },
+  "addLoginMenu": {
+    "message": "افزودن ورود"
+  },
+  "addCardMenu": {
+    "message": "افزودن کارت"
+  },
+  "addIdentityMenu": {
+    "message": "افزودن هویت"
+  },
   "unlockVaultMenu": {
     "message": "قفل گاوصندوق خود را باز کنید"
   },
@@ -637,7 +661,7 @@
     "message": "برای پر کردن خودکار گاوصندوق Bitwarden خود را باز کنید."
   },
   "notificationUnlock": {
-    "message": "بازگشایی"
+    "message": "باز کردن قفل"
   },
   "enableContextMenuItem": {
     "message": "نمایش گزینه‌های منوی زمینه"
@@ -702,7 +726,7 @@
     "message": "درباره سازمان‌ها اطلاعات کسب کنید"
   },
   "learnOrgConfirmation": {
-    "message": "Bitwarden به شما اجازه می‌دهد با استفاده از سازماندهی، موارد گاوصندوق خود را با دیگران به اشتراک بگذارید. آیا مایل به بازدید از وب سایت bitwarden.com برای کسب اطلاعات بیشتر هستید؟"
+    "message": "Bitwarden به شما اجازه می‌دهد با استفاده از سازمان، موارد گاوصندوق خود را با دیگران به اشتراک بگذارید. آیا مایل به بازدید از وب سایت bitwarden.com برای کسب اطلاعات بیشتر هستید؟"
   },
   "moveToOrganization": {
     "message": "انتقال به سازمان"
@@ -772,7 +796,7 @@
     "message": "ویژگی موجود نیست"
   },
   "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+    "message": "انتقال کلید رمزگذاری مورد نیاز است. لطفاً از طریق گاوصندوق وب وارد شوید تا کلید رمزگذاری خود را به روز کنید."
   },
   "premiumMembership": {
     "message": "عضویت پرمیوم"
@@ -1606,10 +1630,10 @@
     "message": "بیومتریک مرورگر در این دستگاه پشتیبانی نمی‌شود."
   },
   "biometricsFailedTitle": {
-    "message": "زیست‌سنجی ناتمام ماند"
+    "message": "زیست‌سنجی ناموفق بود"
   },
   "biometricsFailedDesc": {
-    "message": "زیست‌سنجی نمی تواند انجام شود، استفاده از کلمه عبور اصلی یا خروج را در نظر بگیرید. اگر این مشکل ادامه یافت لطفا با پشتیبانی Bitwarden تماس بگیرید."
+    "message": "زیست‌سنجی نمی‌تواند انجام شود، استفاده از کلمه عبور اصلی یا خروج را در نظر بگیرید. اگر این مشکل ادامه یافت لطفاً با پشتیبانی Bitwarden تماس بگیرید."
   },
   "nativeMessaginPermissionErrorTitle": {
     "message": "مجوز ارائه نشده است"
@@ -1992,7 +2016,7 @@
     "message": "برون ریزی گاو‌صندوق شخصی"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "فقط موارد شخصی گاوصندوق مرتبط با $EMAIL$ برون ریزی خواهند شد. موارد گاوصندوق سازمان شامل نخواهد شد. فقط اطلاعات مورد گاوصندوق برون ریزی خواهد شد و شامل تاریخچه کلمه عبور مرتبط یا پیوست نمی‌شود.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2234,28 +2258,28 @@
     }
   },
   "loggingInOn": {
-    "message": "ورود به عنوان"
+    "message": "ورود با"
   },
   "opensInANewWindow": {
     "message": "در پنجره جدید باز می‌شود"
   },
   "deviceApprovalRequired": {
-    "message": "تایید دستگاه لازم است. یک روش تایید برگزینید:"
+    "message": "تأیید دستگاه لازم است. یک روش تأیید انتخاب کنید:"
   },
   "rememberThisDevice": {
     "message": "این دستگاه را به خاطر بسپار"
   },
   "uncheckIfPublicDevice": {
-    "message": "بردارید اگر از دستگاه عمومی استفاده میکنید"
+    "message": "اگر از دستگاه عمومی استفاده می‌کنید علامت را بردارید"
   },
   "approveFromYourOtherDevice": {
-    "message": "تایید با دستگاه دیگرتان"
+    "message": "تأیید با دستگاه دیگرتان"
   },
   "requestAdminApproval": {
-    "message": "درخواست تایید مدیر"
+    "message": "درخواست تأیید مدیر"
   },
   "approveWithMasterPassword": {
-    "message": "تایید با کلمه عبور اصلی"
+    "message": "تأیید با کلمه عبور اصلی"
   },
   "ssoIdentifierRequired": {
     "message": "شناسه سازمان SSO مورد نیاز است."
@@ -2283,37 +2307,37 @@
     "message": "حساب کاربری با موفقیت ایجاد شد!"
   },
   "adminApprovalRequested": {
-    "message": "تایید مدیر در خواست شد"
+    "message": "تأیید مدیر درخواست شد"
   },
   "adminApprovalRequestSentToAdmins": {
     "message": "درخواست شما به مدیرتان فرستاده شد."
   },
   "youWillBeNotifiedOnceApproved": {
-    "message": "به محض تایید مطلع خواهید شد."
+    "message": "به محض تأیید مطلع خواهید شد."
   },
   "troubleLoggingIn": {
     "message": "در ورود مشکلی دارید؟"
   },
   "loginApproved": {
-    "message": "ورود تایید شد"
+    "message": "ورود تأیید شد"
   },
   "userEmailMissing": {
-    "message": "رایانامه کاربر کم است"
+    "message": "ایمیل کاربر وجود ندارد"
   },
   "deviceTrusted": {
     "message": "دستگاه مورد اعتماد است"
   },
   "inputRequired": {
-    "message": "ورودی مورد نیاز است."
+    "message": "ورودی ضروری است."
   },
   "required": {
-    "message": "الزامی"
+    "message": "ضروری"
   },
   "search": {
     "message": "جستجو"
   },
   "inputMinLength": {
-    "message": "ورودی باید حداقل $COUNT$ نشانه داشته باشد.",
+    "message": "ورودی باید حداقل $COUNT$ کاراکتر داشته باشد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2322,7 +2346,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "اندازه ورودی نباید بیش از $COUNT$ نشانه باشد.",
+    "message": "طول ورودی نباید بیش از $COUNT$ کاراکتر باشد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2331,7 +2355,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "نشانه های زیر مجاز نیستند: $CHARACTERS$",
+    "message": "کاراکترهای زیر مجاز نیستند: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -2340,7 +2364,7 @@
     }
   },
   "inputMinValue": {
-    "message": "مقدار ورودی باید دست کم $MIN$ باشد.",
+    "message": "مقدار ورودی باید حداقل $MIN$ باشد.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -2349,7 +2373,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "مقدار ورودی نباید بیش از $MAX$ باشد.",
+    "message": "مقدار ورودی نباید از $MAX$ تجاوز کند.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -2358,17 +2382,17 @@
     }
   },
   "multipleInputEmails": {
-    "message": "یک یا چند رایانامه نامعتبر است"
+    "message": "یک یا چند ایمیل نامعتبر است"
   },
   "inputTrimValidator": {
-    "message": "ورودی نباید فقط فاصله باشد.",
+    "message": "ورودی نباید فقط حاوی فضای خالی باشد.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "ورودی یک نشانی رایانامه نیست."
+    "message": "ورودی یک نشانی ایمیل نیست."
   },
   "fieldsNeedAttention": {
-    "message": "بخش (های) $COUNT$ در بالا نیازمند توجه شما است.",
+    "message": "فیلد $COUNT$ در بالا به توجه شما نیاز دارد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2380,16 +2404,16 @@
     "message": "-- انتخاب --"
   },
   "multiSelectPlaceholder": {
-    "message": "-- برای گزینش چیزی بنویسید --"
+    "message": "-- برای فیلتر تایپ کنید --"
   },
   "multiSelectLoading": {
     "message": "در حال بازیابی گزینه‌ها..."
   },
   "multiSelectNotFound": {
-    "message": "موردی پیدا نشد"
+    "message": "موردی یافت نشد"
   },
   "multiSelectClearAll": {
-    "message": "پاک کردن همه"
+    "message": "پاک‌کردن همه"
   },
   "plusNMore": {
     "message": "+ $QUANTITY$ بیشتر",
@@ -2401,25 +2425,25 @@
     }
   },
   "submenu": {
-    "message": "زیرفهرست"
+    "message": "زیرمنو"
   },
   "toggleCollapse": {
-    "message": "باز و بسته کردن",
+    "message": "دکمه بستن",
     "description": "Toggling an expand/collapse state."
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "دامنه مستعار"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
+    "message": "موارد با درخواست مجدد کلمه عبور اصلی را نمی‌توان در بارگذاری صفحه به‌صورت خودکار پر کرد. پر کردن خودکار در بارگیری صفحه خاموش شد.",
     "description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load."
   },
   "autofillOnPageLoadSetToDefault": {
-    "message": "Auto-fill on page load set to use default setting.",
+    "message": "پر کردن خودکار در بارگیری صفحه برای استفاده از تنظیمات پیش‌فرض تنظیم شده است.",
     "description": "Toast message for informing the user that auto-fill on page load has been set to the default setting."
   },
   "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
+    "message": "برای ویرایش این فیلد، درخواست مجدد کلمه عبور اصلی را خاموش کنید",
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   }
 }
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 3a829d4783d..daaa9a89258 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automaattinen täyttö"
   },
+  "autoFillLogin": {
+    "message": "Täytä kirjautumistieto automaattisesti"
+  },
+  "autoFillCard": {
+    "message": "Täytä kortti automaattisesti"
+  },
+  "autoFillIdentity": {
+    "message": "Täytä identiteetti automaattisesti"
+  },
   "generatePasswordCopied": {
     "message": "Luo salasana (leikepöydälle)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Ei tunnistettuja kirjautumistietoja."
   },
+  "noCards": {
+    "message": "Kortteja ei ole"
+  },
+  "noIdentities": {
+    "message": "Identiteettejä ei ole"
+  },
+  "addLoginMenu": {
+    "message": "Lisää kirjautumistieto"
+  },
+  "addCardMenu": {
+    "message": "Lisää kortti"
+  },
+  "addIdentityMenu": {
+    "message": "Lisää identiteetti"
+  },
   "unlockVaultMenu": {
     "message": "Avaa holvisi"
   },
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index a8673d001ae..464cf888899 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill sa Filipino ay Awtomatikong Pagpuno"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Maglagay ng Password"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Walang tumutugmang mga login"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Buksan ang iyong kahadeyero"
   },
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index ba4d6a6dd86..b0827b39006 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Saisie automatique"
   },
+  "autoFillLogin": {
+    "message": "Saisie automatique de l'identifiant"
+  },
+  "autoFillCard": {
+    "message": "Saisie automatique de la carte"
+  },
+  "autoFillIdentity": {
+    "message": "Saisie automatique de l'identité"
+  },
   "generatePasswordCopied": {
     "message": "Générer un mot de passe (copié)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Aucun identifiant correspondant."
   },
+  "noCards": {
+    "message": "Aucune carte"
+  },
+  "noIdentities": {
+    "message": "Aucune identité"
+  },
+  "addLoginMenu": {
+    "message": "Ajouter un identifiant"
+  },
+  "addCardMenu": {
+    "message": "Ajouter une carte"
+  },
+  "addIdentityMenu": {
+    "message": "Ajouter une identité"
+  },
   "unlockVaultMenu": {
     "message": "Déverrouillez votre coffre"
   },
@@ -634,7 +658,7 @@
     "message": "Mettre à jour"
   },
   "notificationUnlockDesc": {
-    "message": "Unlock your Bitwarden vault to complete the auto-fill request."
+    "message": "Déverrouillez votre coffre Bitwarden pour terminer la demande de saisie automatique."
   },
   "notificationUnlock": {
     "message": "Déverrouiller"
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 68f1ebc1218..19985cd5ec8 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "השלמה אוטומטית"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "צור סיסמה (העתק)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "לא נמצאו פרטי כניסה תואמים."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "שחרור הכספת שלך"
   },
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index 2b99c964209..4b686192902 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "स्वत:भरण"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate Password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "कोई मेल-मिला लॉगिन नहीं |"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "आपकी तिजोरी का ताला खोलें"
   },
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index b88c097804f..b334d22332f 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-ispuna"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generiraj lozinku (i kopiraj)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nema podudarajućih prijava"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Otključaj svoj trezor"
   },
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index efe6d260355..abf5a12e5e5 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automatikus kitöltés"
   },
+  "autoFillLogin": {
+    "message": "Automatikus kitöltés bejelentkezés"
+  },
+  "autoFillCard": {
+    "message": "Automatikus kitöltés kártya"
+  },
+  "autoFillIdentity": {
+    "message": "Automatikus kitöltés személyazonosság"
+  },
   "generatePasswordCopied": {
     "message": "Jelszó generálás (másolt)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nincsenek egyező bejelentkezések."
   },
+  "noCards": {
+    "message": "Nincsenek kártyák"
+  },
+  "noIdentities": {
+    "message": "Nincsenek személyazonosságok"
+  },
+  "addLoginMenu": {
+    "message": "Bejelentkezés hozzáadása"
+  },
+  "addCardMenu": {
+    "message": "Kártya hozzáadása"
+  },
+  "addIdentityMenu": {
+    "message": "Személyazonossság hozzáadása"
+  },
   "unlockVaultMenu": {
     "message": "Széf kinyitása"
   },
@@ -143,7 +167,7 @@
     "message": "A folytatáshoz meg kell erősíteni a személyazonosságot."
   },
   "account": {
-    "message": "Felhasználó"
+    "message": "Fiók"
   },
   "changeMasterPassword": {
     "message": "Mesterjelszó módosítása"
@@ -513,7 +537,7 @@
     "message": "A kétlépcsős bejelentkezés biztonságosabbá teszi a fiókot azáltal, hogy ellenőrizni kell a bejelentkezést egy másik olyan eszközzel mint például biztonsági kulcs, hitelesítő alkalmazás, SMS, telefon hívás vagy email. A kétlépcsős bejelentkezést a bitwarden.com webes széfben lehet engedélyezni. Felkeressük a webhelyet most?"
   },
   "editedFolder": {
-    "message": "A mappa módosításra került."
+    "message": "A mappa mentésre került."
   },
   "deleteFolderConfirmation": {
     "message": "Biztos, hogy törölni akarod ezt a mappát?"
@@ -562,7 +586,7 @@
     "message": "Biztosan törlésre kerüljön ezt az elem?"
   },
   "deletedItem": {
-    "message": "Az elem törlésre került."
+    "message": "Az elem a lomtárba került."
   },
   "overwritePassword": {
     "message": "Jelszó felülírása"
@@ -769,7 +793,7 @@
     "message": "A naximális fájlméret 500 MB."
   },
   "featureUnavailable": {
-    "message": "Ez a funkció nem érhető el."
+    "message": "A funkció nem érhető el."
   },
   "encryptionKeyMigrationRequired": {
     "message": "Titkosítási kulcs migráció szükséges. Jelentkezzünk be a webes széfen keresztül a titkosítási kulcs frissítéséhez."
@@ -787,7 +811,7 @@
     "message": "Tagság frissítése"
   },
   "premiumNotCurrentMember": {
-    "message": "Jelenleg nincs prémium tagság."
+    "message": "Jelenleg nem vagyunk prémium tag."
   },
   "premiumSignUpAndGet": {
     "message": "Regisztráció a prémium tagságra az alábbi funkciókért:"
@@ -796,7 +820,7 @@
     "message": "1 GB titkosított tárhely a fájlmellékleteknek."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Proprietary two-step login options such as YubiKey and Duo."
+    "message": "Saját kétlépcsős bejelentkezési lehetőségek mint a YubiKey és a Duo."
   },
   "ppremiumSignUpReports": {
     "message": "Jelszó higiénia, fiók biztonság és adatszivárgási jelentések a széf biztonsága érdekében."
@@ -817,7 +841,7 @@
     "message": "A prémium tagság megvásárolható a bitwarden.com webes széfben. Szeretnénk felkeresni a webhelyet most?"
   },
   "premiumCurrentMember": {
-    "message": "Jelenleg a prémium tagság érvényben van."
+    "message": "Prémium tag vagyunk!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Köszönjük a Bitwarden támogatását."
@@ -994,7 +1018,7 @@
     "message": "Alapértelmezett beállítások bejelentkezési elemekhez"
   },
   "defaultAutoFillOnPageLoadDesc": {
-    "message": "Az Automatikus kitöltés engedélyezése az oldalbetöltéskor engedélyezheti vagy letilthatja a funkciót az egyes bejelentkezési elemeknél. Ez az alapértelmezett beállítás a bejelentkezési elemeknéll, amelyek nincsenek külön konfigurálva."
+    "message": "Az egyes bejelentkezési elemeknél kikapcsolhatjuk oldalbetöltéskor az automatikus kitöltést az elem Szerkesztés nézetében."
   },
   "itemAutoFillOnPageLoad": {
     "message": "Automatikus kitöltés oldal betöltésnél (Ha engedélyezett az opcióknál)"
@@ -1905,7 +1929,7 @@
     "message": "Perc"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "A szervezeti házirendek hatással vannak a széf időkorlátjára. A széf időkorlátja legfeljebb $HOURS$ óra és $MINUTES$ perc lehet.",
+    "message": "A szervezeti szabályzata $HOURS$ órára és $MINUTES$ percre állította be a maximálisan megengedett széf időtúllépést.",
     "placeholders": {
       "hours": {
         "content": "$1",
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index f3fdd1a7c27..7b19a6838c0 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Isi otomatis"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Membuat Kata Sandi (tersalin)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Tidak ada info masuk yang cocok."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Buka brankas Anda"
   },
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index 691e2484cba..9bca2da6062 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Riempimento automatico"
   },
+  "autoFillLogin": {
+    "message": "Riempi automaticamente login"
+  },
+  "autoFillCard": {
+    "message": "Riempi automaticamente carta"
+  },
+  "autoFillIdentity": {
+    "message": "Riempi automaticamente identità"
+  },
   "generatePasswordCopied": {
     "message": "Genera password e copiala"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nessun login corrispondente"
   },
+  "noCards": {
+    "message": "Nessuna carta"
+  },
+  "noIdentities": {
+    "message": "Nessuna identità"
+  },
+  "addLoginMenu": {
+    "message": "Aggiungi login"
+  },
+  "addCardMenu": {
+    "message": "Aggiungi carta"
+  },
+  "addIdentityMenu": {
+    "message": "Aggiungi identità"
+  },
   "unlockVaultMenu": {
     "message": "Sblocca la tua cassaforte"
   },
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index c3762ae4ef8..d2528a45489 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "自動入力"
   },
+  "autoFillLogin": {
+    "message": "自動入力ログイン"
+  },
+  "autoFillCard": {
+    "message": "自動入力カード"
+  },
+  "autoFillIdentity": {
+    "message": "自動入力 ID"
+  },
   "generatePasswordCopied": {
     "message": "パスワードを生成 (コピー)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "一致するログインがありません。"
   },
+  "noCards": {
+    "message": "カードなし"
+  },
+  "noIdentities": {
+    "message": "ID なし"
+  },
+  "addLoginMenu": {
+    "message": "ログイン情報を追加"
+  },
+  "addCardMenu": {
+    "message": "カードを追加"
+  },
+  "addIdentityMenu": {
+    "message": "ID を追加"
+  },
   "unlockVaultMenu": {
     "message": "保管庫のロックを解除"
   },
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index 50a25ad0dd9..2d2b5cb8a5e 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "თვითშევსება"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index 06f9461e5fd..95c9350aff8 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "ಸ್ವಯಂ ಭರ್ತಿ"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "ಪಾಸ್ವರ್ಡ್ ರಚಿಸಿ (ನಕಲಿಸಲಾಗಿದೆ)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "ಹೊಂದಾಣಿಕೆಯ ಲಾಗಿನ್‌ಗಳು ಇಲ್ಲ."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index 5921e579e24..e7aba95f493 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "자동 완성"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "비밀번호 생성 및 클립보드에 복사"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "사용할 수 있는 로그인이 없습니다."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "보관함 잠금 해제"
   },
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index 425d0c98233..885b3cbec8f 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automatinis užpildymas"
   },
+  "autoFillLogin": {
+    "message": "Automatinio užpildymo prisijungimas"
+  },
+  "autoFillCard": {
+    "message": "Automatinio užpildymo kortelė"
+  },
+  "autoFillIdentity": {
+    "message": "Automatinio užpildymo tapatybė"
+  },
   "generatePasswordCopied": {
     "message": "Kurti slaptažodį (paruoštas įterpti)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nėra atitinkančių prisijungimų."
   },
+  "noCards": {
+    "message": "Nėra kortelių"
+  },
+  "noIdentities": {
+    "message": "Nėra tapatybių"
+  },
+  "addLoginMenu": {
+    "message": "Pridėti prisijungimą"
+  },
+  "addCardMenu": {
+    "message": "Pridėti kortelę"
+  },
+  "addIdentityMenu": {
+    "message": "Pridėti tapatybę"
+  },
   "unlockVaultMenu": {
     "message": "Atrakinti saugyklą"
   },
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index 624904d7213..2abb0ac4de6 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automātiskā aizpildīšana"
   },
+  "autoFillLogin": {
+    "message": "Automātiski aizpildīt pieteikšanos"
+  },
+  "autoFillCard": {
+    "message": "Automātiski aizpildīt karti"
+  },
+  "autoFillIdentity": {
+    "message": "Automātiski aizpildīt identitāti"
+  },
   "generatePasswordCopied": {
     "message": "Izveidot paroli (tiks ievietota starpliktuvē)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nav atbilstošu pieteikšanās vienumu"
   },
+  "noCards": {
+    "message": "Nav karšu"
+  },
+  "noIdentities": {
+    "message": "Nav identitāšu"
+  },
+  "addLoginMenu": {
+    "message": "Pievienot pieteikšanās vienumu"
+  },
+  "addCardMenu": {
+    "message": "Pievienot karti"
+  },
+  "addIdentityMenu": {
+    "message": "Pievienot identitāti"
+  },
   "unlockVaultMenu": {
     "message": "Atslēgt glabātavu"
   },
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index 58d5b04fc8b..258ad3fd966 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "ഓട്ടോഫിൽ"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "പാസ്‌വേഡ് സൃഷ്ടിക്കുക (പകർത്തുക )"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "പൊരുത്തപ്പെടുന്ന ലോഗിനുകളൊന്നുമില്ല."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index 8f8f58775f7..131c062d544 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "स्वयंभरण"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "तिजोरी उघडा"
   },
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index 4dadbbc8a7b..43a19478bb0 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-utfylling"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generer et passord (kopiert)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Ingen samsvarende innlogginger."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Lås opp hvelvet ditt"
   },
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index 5915dad872a..630510f6723 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-invullen"
   },
+  "autoFillLogin": {
+    "message": "Login automatisch invullen"
+  },
+  "autoFillCard": {
+    "message": "Kaart automatisch invullen"
+  },
+  "autoFillIdentity": {
+    "message": "Identiteit automatisch invullen"
+  },
   "generatePasswordCopied": {
     "message": "Wachtwoord genereren (op klembord)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Geen overeenkomstige logins."
   },
+  "noCards": {
+    "message": "Geen kaarten"
+  },
+  "noIdentities": {
+    "message": "Geen identiteiten"
+  },
+  "addLoginMenu": {
+    "message": "Login toevoegen"
+  },
+  "addCardMenu": {
+    "message": "Kaart toevoegen"
+  },
+  "addIdentityMenu": {
+    "message": "Identiteit toevoegen"
+  },
   "unlockVaultMenu": {
     "message": "Ontgrendel je kluis"
   },
@@ -772,7 +796,7 @@
     "message": "Functionaliteit niet beschikbaar"
   },
   "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+    "message": "Migratie van de encryptiesleutel vereist. Login via de website om je sleutel te bij te werken."
   },
   "premiumMembership": {
     "message": "Premium-abonnement"
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index 2f28c87d801..5b16c13ef14 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Autouzupełnianie"
   },
+  "autoFillLogin": {
+    "message": "Autouzupełnianie logowania"
+  },
+  "autoFillCard": {
+    "message": "Autouzupełnianie karty"
+  },
+  "autoFillIdentity": {
+    "message": "Autouzupełnianie tożsamości"
+  },
   "generatePasswordCopied": {
     "message": "Wygeneruj hasło (do schowka)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Brak pasujących danych logowania"
   },
+  "noCards": {
+    "message": "Brak kart"
+  },
+  "noIdentities": {
+    "message": "Brak tożsamości"
+  },
+  "addLoginMenu": {
+    "message": "Dodaj dane logowania"
+  },
+  "addCardMenu": {
+    "message": "Dodaj kartę"
+  },
+  "addIdentityMenu": {
+    "message": "Dodaj tożsamość"
+  },
   "unlockVaultMenu": {
     "message": "Odblokuj sejf"
   },
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index ed62f893a19..7578ae170ca 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Autopreencher"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Gerar Senha (copiada)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Sem credenciais correspondentes."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Desbloqueie seu cofre"
   },
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index 735edf60afe..1495b64e453 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Preenchimento automático"
   },
+  "autoFillLogin": {
+    "message": "Preenchimento automático da credencial"
+  },
+  "autoFillCard": {
+    "message": "Preenchimento automático do cartão"
+  },
+  "autoFillIdentity": {
+    "message": "Preenchimento automático da identidade"
+  },
   "generatePasswordCopied": {
     "message": "Gerar palavra-passe (copiada)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Sem credenciais correspondentes"
   },
+  "noCards": {
+    "message": "Sem cartões"
+  },
+  "noIdentities": {
+    "message": "Sem identidades"
+  },
+  "addLoginMenu": {
+    "message": "Adicionar credencial"
+  },
+  "addCardMenu": {
+    "message": "Adicionar cartão"
+  },
+  "addIdentityMenu": {
+    "message": "Adicionar identidade"
+  },
   "unlockVaultMenu": {
     "message": "Desbloquear o cofre"
   },
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index f525f87b6c2..085951a93f1 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-completare"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generare parolă (s-a copiat)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Nu există potrivire de autentificări"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Deblocați-vă seiful"
   },
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index 40452e56dce..40ecd382bd5 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Автозаполнение"
   },
+  "autoFillLogin": {
+    "message": "Автозаполнение логина"
+  },
+  "autoFillCard": {
+    "message": "Автозаполнение карты"
+  },
+  "autoFillIdentity": {
+    "message": "Автозаполнение личности"
+  },
   "generatePasswordCopied": {
     "message": "Сгенерировать пароль (с копированием)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Нет подходящих логинов."
   },
+  "noCards": {
+    "message": "Нет карт"
+  },
+  "noIdentities": {
+    "message": "Нет личностей"
+  },
+  "addLoginMenu": {
+    "message": "Добавить логин"
+  },
+  "addCardMenu": {
+    "message": "Добавить карту"
+  },
+  "addIdentityMenu": {
+    "message": "Добавить личность"
+  },
   "unlockVaultMenu": {
     "message": "Разблокировать хранилище"
   },
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index 04f2a619a82..8ea364cb6d1 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "ස්වයං-පිරවීම"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "මුරපදය ජනනය (පිටපත්)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "ගැලපෙන පිවිසුම් නොමැත."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index 684c677c45b..d04f2ccf05a 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Automatické vypĺňanie"
   },
+  "autoFillLogin": {
+    "message": "Automatické vyplnenie prihlasovacích údajov"
+  },
+  "autoFillCard": {
+    "message": "Automatické vyplnenie karty"
+  },
+  "autoFillIdentity": {
+    "message": "Automatické vyplnenie identity"
+  },
   "generatePasswordCopied": {
     "message": "Vygenerovať heslo (skopírované)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Žiadne zodpovedajúce prihlasovacie údaje."
   },
+  "noCards": {
+    "message": "Žiadne karty"
+  },
+  "noIdentities": {
+    "message": "Žiadne identity"
+  },
+  "addLoginMenu": {
+    "message": "Pridať prihlasovacie údaje"
+  },
+  "addCardMenu": {
+    "message": "Pridať kartu"
+  },
+  "addIdentityMenu": {
+    "message": "Pridať identitu"
+  },
   "unlockVaultMenu": {
     "message": "Odomknúť trezor"
   },
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 8878c308045..5f859e9e5f3 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Samodejno izpolnjevanje"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generiraj geslo (kopirano)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Ni ustreznih prijav."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Odkleni svoj trezor"
   },
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index 46e96c7d8df..c496e7628d9 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Аутоматско допуњавање"
   },
+  "autoFillLogin": {
+    "message": "Ауто-пуњење пријаве"
+  },
+  "autoFillCard": {
+    "message": "Ауто-пуњење картице"
+  },
+  "autoFillIdentity": {
+    "message": "Ауто-пуњење идентитета"
+  },
   "generatePasswordCopied": {
     "message": "Генериши Лозинку (копирано)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Нема одговарајућих пријављивања."
   },
+  "noCards": {
+    "message": "Нема карте"
+  },
+  "noIdentities": {
+    "message": "Нема идентитета"
+  },
+  "addLoginMenu": {
+    "message": "Нема пријаве"
+  },
+  "addCardMenu": {
+    "message": "Додати картицу"
+  },
+  "addIdentityMenu": {
+    "message": "Додати идентитет"
+  },
   "unlockVaultMenu": {
     "message": "Откључај свој сеф"
   },
@@ -2408,7 +2432,7 @@
     "description": "Toggling an expand/collapse state."
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Домен алијаса"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
     "message": "Ставке са упитом за поновно постављање главне лозинке не могу се ауто-попунити при учитавању странице. Ауто-попуњавање при учитавању странице је искључено.",
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index 680a3aac0bd..283665f4977 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Fyll i automatiskt"
   },
+  "autoFillLogin": {
+    "message": "Autofyll inloggning"
+  },
+  "autoFillCard": {
+    "message": "Autofyll kort"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Skapa lösenord (kopierad)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Inga matchande inloggningar"
   },
+  "noCards": {
+    "message": "Inga kort"
+  },
+  "noIdentities": {
+    "message": "Inga identiteter"
+  },
+  "addLoginMenu": {
+    "message": "Lägg till inloggning"
+  },
+  "addCardMenu": {
+    "message": "Lägg till kort"
+  },
+  "addIdentityMenu": {
+    "message": "Lägg till identitet"
+  },
   "unlockVaultMenu": {
     "message": "Lås upp ditt valv"
   },
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index f8ffeff747e..22330901579 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Auto-fill"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "No matching logins"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
   },
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index 0db240ea797..20702a1de4a 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "กรอกข้อมูลอัตโนมัติ"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Generate Password (copied)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "ไม่พบข้อมูลล็อกอินที่ตรงกัน"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "ปลดล็อกกตู้นิรภัยของคุณ"
   },
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index e52a2f59f26..e9763386aa6 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Otomatik doldur"
   },
+  "autoFillLogin": {
+    "message": "Hesabı otomatik doldur"
+  },
+  "autoFillCard": {
+    "message": "Kartı otomatik doldur"
+  },
+  "autoFillIdentity": {
+    "message": "Kimliği otomatik doldur"
+  },
   "generatePasswordCopied": {
     "message": "Parola oluştur (ve kopyala)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Eşleşen hesap yok"
   },
+  "noCards": {
+    "message": "Kart yok"
+  },
+  "noIdentities": {
+    "message": "Kimlik yok"
+  },
+  "addLoginMenu": {
+    "message": "Hesap ekle"
+  },
+  "addCardMenu": {
+    "message": "Kart ekle"
+  },
+  "addIdentityMenu": {
+    "message": "Kimlik ekle"
+  },
   "unlockVaultMenu": {
     "message": "Kasanızın kilidini açın"
   },
@@ -1609,7 +1633,7 @@
     "message": "Biyometri doğrulanamadı"
   },
   "biometricsFailedDesc": {
-    "message": "Biometrics cannot be completed, consider using a master password or logging out. If this persists, please contact Bitwarden support."
+    "message": "Biyometri doğrulaması tamamlanamadı. Ana parolanızı kullanabilir veya çıkış yapabilirsiniz. Sorun devam ederse Bitwarden destek ekibiyle iletişime geçin."
   },
   "nativeMessaginPermissionErrorTitle": {
     "message": "İzin verilmedi"
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index 6cb70bd76bd..666870146d4 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Автозаповнення"
   },
+  "autoFillLogin": {
+    "message": "Автозаповнення входу"
+  },
+  "autoFillCard": {
+    "message": "Автозаповнення картки"
+  },
+  "autoFillIdentity": {
+    "message": "Автозаповнення особистих даних"
+  },
   "generatePasswordCopied": {
     "message": "Генерувати пароль (з копіюванням)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Немає відповідних записів"
   },
+  "noCards": {
+    "message": "Немає карток"
+  },
+  "noIdentities": {
+    "message": "Немає особистих даних"
+  },
+  "addLoginMenu": {
+    "message": "Додати запис входу"
+  },
+  "addCardMenu": {
+    "message": "Додати картку"
+  },
+  "addIdentityMenu": {
+    "message": "Додати особисті дані"
+  },
   "unlockVaultMenu": {
     "message": "Розблокуйте сховище"
   },
@@ -2408,18 +2432,18 @@
     "description": "Toggling an expand/collapse state."
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Псевдонім домену"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
+    "message": "Записи з повторним запитом головного пароля не можна автоматично заповнювати під час завантаження сторінки. Автозаповнення на сторінці вимкнено.",
     "description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load."
   },
   "autofillOnPageLoadSetToDefault": {
-    "message": "Auto-fill on page load set to use default setting.",
+    "message": "Автозаповнення на сторінці налаштовано з типовими параметрами.",
     "description": "Toast message for informing the user that auto-fill on page load has been set to the default setting."
   },
   "turnOffMasterPasswordPromptToEditField": {
-    "message": "Turn off master password re-prompt to edit this field",
+    "message": "Вимкніть повторний запит головного пароля, щоб редагувати це поле",
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   }
 }
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index e562a0b5d5d..caedbb8b917 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "Tự động điền"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "Tạo mật khẩu (đã sao chép)"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "Không có thông tin đăng nhập phù hợp."
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "Mở khoá kho lưu trữ của bạn"
   },
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index b1d0aac7e4a..5331208af82 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "自动填充"
   },
+  "autoFillLogin": {
+    "message": "自动填充登录"
+  },
+  "autoFillCard": {
+    "message": "自动填充支付卡"
+  },
+  "autoFillIdentity": {
+    "message": "自动填充身份"
+  },
   "generatePasswordCopied": {
     "message": "生成密码（并复制）"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "无匹配的登录项目"
   },
+  "noCards": {
+    "message": "无支付卡"
+  },
+  "noIdentities": {
+    "message": "无身份"
+  },
+  "addLoginMenu": {
+    "message": "添加登录项目"
+  },
+  "addCardMenu": {
+    "message": "添加支付卡"
+  },
+  "addIdentityMenu": {
+    "message": "添加身份"
+  },
   "unlockVaultMenu": {
     "message": "解锁您的密码库"
   },
@@ -850,7 +874,7 @@
     "message": "使用此功能需要高级会员资格。"
   },
   "enterVerificationCodeApp": {
-    "message": "请输入您的验证器应用中的 6 位验证码。"
+    "message": "请输入您的验证器应用中的 6 位数验证码。"
   },
   "enterVerificationCodeEmail": {
     "message": "请输入发送给电子邮件 $EMAIL$ 的 6 位数验证码。",
@@ -2117,7 +2141,7 @@
     }
   },
   "loginWithMasterPassword": {
-    "message": "主密码登录"
+    "message": "使用主密码登录"
   },
   "loggingInAs": {
     "message": "正登录为"
@@ -2132,7 +2156,7 @@
     "message": "记住电子邮件地址"
   },
   "loginWithDevice": {
-    "message": "设备登录"
+    "message": "使用设备登录"
   },
   "loginWithDeviceEnabledInfo": {
     "message": "设备登录必须在 Bitwarden 应用程序的设置中启用。需要其他登录选项吗？"
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index 58ca526bc68..b3368beb188 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -91,6 +91,15 @@
   "autoFill": {
     "message": "自動填入"
   },
+  "autoFillLogin": {
+    "message": "Auto-fill login"
+  },
+  "autoFillCard": {
+    "message": "Auto-fill card"
+  },
+  "autoFillIdentity": {
+    "message": "Auto-fill identity"
+  },
   "generatePasswordCopied": {
     "message": "產生及複製密碼"
   },
@@ -100,6 +109,21 @@
   "noMatchingLogins": {
     "message": "無符合的登入資料"
   },
+  "noCards": {
+    "message": "No cards"
+  },
+  "noIdentities": {
+    "message": "No identities"
+  },
+  "addLoginMenu": {
+    "message": "Add login"
+  },
+  "addCardMenu": {
+    "message": "Add card"
+  },
+  "addIdentityMenu": {
+    "message": "Add identity"
+  },
   "unlockVaultMenu": {
     "message": "解鎖您的密碼庫"
   },
diff --git a/apps/browser/src/auth/popup/two-factor.component.html b/apps/browser/src/auth/popup/two-factor.component.html
index 7fec67378cc..d03c675abdc 100644
--- a/apps/browser/src/auth/popup/two-factor.component.html
+++ b/apps/browser/src/auth/popup/two-factor.component.html
@@ -113,7 +113,10 @@
       "
     >
       <div id="duo-frame">
-        <iframe id="duo_iframe" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
+        <iframe
+          id="duo_iframe"
+          sandbox="allow-scripts allow-forms allow-same-origin allow-popups allow-popups-to-escape-sandbox"
+        ></iframe>
       </div>
       <div class="box">
         <div class="box-content">
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
index 665c4e9acb8..5c6b5e07da3 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
@@ -4,6 +4,7 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
@@ -65,6 +66,7 @@ describe("ContextMenuClickedHandler", () => {
   let autofill: AutofillAction;
   let authService: MockProxy<AuthService>;
   let cipherService: MockProxy<CipherService>;
+  let stateService: MockProxy<StateService>;
   let totpService: MockProxy<TotpService>;
   let eventCollectionService: MockProxy<EventCollectionService>;
   let userVerificationService: MockProxy<UserVerificationService>;
@@ -77,6 +79,7 @@ describe("ContextMenuClickedHandler", () => {
     autofill = jest.fn<Promise<void>, [tab: chrome.tabs.Tab, cipher: CipherView]>();
     authService = mock();
     cipherService = mock();
+    stateService = mock();
     totpService = mock();
     eventCollectionService = mock();
 
@@ -86,6 +89,7 @@ describe("ContextMenuClickedHandler", () => {
       autofill,
       authService,
       cipherService,
+      stateService,
       totpService,
       eventCollectionService,
       userVerificationService
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 2df42fc2a90..54c3e244991 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -4,6 +4,7 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { EventType } from "@bitwarden/common/enums";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -63,6 +64,7 @@ export class ContextMenuClickedHandler {
     private autofillAction: AutofillAction,
     private authService: AuthService,
     private cipherService: CipherService,
+    private stateService: StateService,
     private totpService: TotpService,
     private eventCollectionService: EventCollectionService,
     private userVerificationService: UserVerificationService
@@ -114,6 +116,7 @@ export class ContextMenuClickedHandler {
       (tab, cipher) => autofillCommand.doAutofillTabWithCipherCommand(tab, cipher),
       await authServiceFactory(cachedServices, serviceOptions),
       await cipherServiceFactory(cachedServices, serviceOptions),
+      await stateServiceFactory(cachedServices, serviceOptions),
       await totpServiceFactory(cachedServices, serviceOptions),
       await eventCollectionServiceFactory(cachedServices, serviceOptions),
       await userVerificationServiceFactory(cachedServices, serviceOptions)
@@ -224,6 +227,7 @@ export class ContextMenuClickedHandler {
       return;
     }
 
+    this.stateService.setLastActive(new Date().getTime());
     switch (info.parentMenuItemId) {
       case AUTOFILL_ID:
       case AUTOFILL_IDENTITY_ID:
diff --git a/apps/browser/src/autofill/content/autofill.js b/apps/browser/src/autofill/content/autofill.js
index 2f3857d3fa8..ef0fb73408b 100644
--- a/apps/browser/src/autofill/content/autofill.js
+++ b/apps/browser/src/autofill/content/autofill.js
@@ -993,11 +993,6 @@
       function fillTheElement(el, op) {
           var shouldCheck;
           if (el && null !== op && void 0 !== op && !(el.disabled || el.a || el.readOnly)) {
-              const tabURLChanged = !fillScript.savedUrls?.some(url => url.startsWith(window.location.origin))
-              // Check to make sure the page location didn't change
-              if (tabURLChanged) {
-                return;
-              }
               switch (markTheFilling && el.form && !el.form.opfilled && (el.form.opfilled = true),
               el.type ? el.type.toLowerCase() : null) {
                   case 'checkbox':
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index ee233c42524..aca72562287 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -148,7 +148,7 @@ export default class AutofillService implements AutofillServiceInterface {
       throw new Error("Nothing to auto-fill.");
     }
 
-    let totpPromise: Promise<string> = null;
+    let totp: string | null = null;
 
     const canAccessPremium = await this.stateService.getCanAccessPremium();
     const defaultUriMatch = (await this.stateService.getDefaultUriMatch()) ?? UriMatchType.Domain;
@@ -205,15 +205,14 @@ export default class AutofillService implements AutofillServiceInterface {
 
         if (
           options.cipher.type !== CipherType.Login ||
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          totpPromise ||
+          totp !== null ||
           !options.cipher.login.totp ||
           (!canAccessPremium && !options.cipher.organizationUseTotp)
         ) {
           return;
         }
 
-        totpPromise = this.stateService.getDisableAutoTotpCopy().then((disabled) => {
+        totp = await this.stateService.getDisableAutoTotpCopy().then((disabled) => {
           if (!disabled) {
             return this.totpService.getCode(options.cipher.login.totp);
           }
@@ -224,8 +223,8 @@ export default class AutofillService implements AutofillServiceInterface {
 
     if (didAutofill) {
       this.eventCollectionService.collect(EventType.Cipher_ClientAutofilled, options.cipher.id);
-      if (totpPromise != null) {
-        return await totpPromise;
+      if (totp !== null) {
+        return totp;
       } else {
         return null;
       }
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
index 0ab74875fbf..828d768ca25 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
@@ -108,7 +108,6 @@ describe("InsertAutofillContentService", () => {
       jest.spyOn(insertAutofillContentService as any, "fillingWithinSandboxedIframe");
       jest.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill");
       jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
       jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
 
       insertAutofillContentService.fillForm(fillScript);
@@ -120,7 +119,6 @@ describe("InsertAutofillContentService", () => {
       expect(
         insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
       ).not.toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
     });
 
@@ -130,7 +128,6 @@ describe("InsertAutofillContentService", () => {
         .mockReturnValue(true);
       jest.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill");
       jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
       jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
 
       insertAutofillContentService.fillForm(fillScript);
@@ -142,7 +139,6 @@ describe("InsertAutofillContentService", () => {
       expect(
         insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
       ).not.toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
     });
 
@@ -154,7 +150,6 @@ describe("InsertAutofillContentService", () => {
         .spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill")
         .mockReturnValue(true);
       jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
       jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
 
       insertAutofillContentService.fillForm(fillScript);
@@ -164,7 +159,6 @@ describe("InsertAutofillContentService", () => {
       expect(
         insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
       ).not.toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
     });
 
@@ -178,7 +172,6 @@ describe("InsertAutofillContentService", () => {
       jest
         .spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
         .mockReturnValue(true);
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(false);
       jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
 
       insertAutofillContentService.fillForm(fillScript);
@@ -188,31 +181,6 @@ describe("InsertAutofillContentService", () => {
       expect(
         insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
       ).toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
-      expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
-    });
-
-    it("returns early if the page location origin does not match against any of the cipher saved URLs", () => {
-      jest
-        .spyOn(insertAutofillContentService as any, "fillingWithinSandboxedIframe")
-        .mockReturnValue(false);
-      jest
-        .spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill")
-        .mockReturnValue(false);
-      jest
-        .spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
-        .mockReturnValue(false);
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(true);
-      jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
-
-      insertAutofillContentService.fillForm(fillScript);
-
-      expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled();
-      expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled();
-      expect(
-        insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
-      ).toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
     });
 
@@ -226,7 +194,6 @@ describe("InsertAutofillContentService", () => {
       jest
         .spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
         .mockReturnValue(false);
-      jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(false);
       jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
 
       insertAutofillContentService.fillForm(fillScript);
@@ -236,7 +203,6 @@ describe("InsertAutofillContentService", () => {
       expect(
         insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
       ).toHaveBeenCalled();
-      expect(insertAutofillContentService["tabURLChanged"]).toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenCalledTimes(3);
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith(
         1,
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
index ad40b76fbcd..46cb53d4f59 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
@@ -38,8 +38,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
       !fillScript.script?.length ||
       this.fillingWithinSandboxedIframe() ||
       this.userCancelledInsecureUrlAutofill(fillScript.savedUrls) ||
-      this.userCancelledUntrustedIframeAutofill(fillScript) ||
-      this.tabURLChanged(fillScript.savedUrls)
+      this.userCancelledUntrustedIframeAutofill(fillScript)
     ) {
       return;
     }
@@ -47,16 +46,6 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
     fillScript.script.forEach(this.runFillScriptAction);
   }
 
-  /**
-   * Determines if the page URL no longer matches one of the cipher's savedURL domains
-   * @param {string[] | null} savedUrls
-   * @returns {boolean}
-   * @private
-   */
-  private tabURLChanged(savedUrls?: AutofillScript["savedUrls"]): boolean {
-    return savedUrls && !savedUrls.some((url) => url.startsWith(window.location.origin));
-  }
-
   /**
    * Identifies if the execution of this script is happening
    * within a sandboxed iframe.
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 7a9863f3a70..caac8e6bb81 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -103,6 +103,12 @@ import {
   VaultExportService,
   VaultExportServiceAbstraction,
 } from "@bitwarden/exporter/vault-export";
+import {
+  ImportApiServiceAbstraction,
+  ImportApiService,
+  ImportServiceAbstraction,
+  ImportService,
+} from "@bitwarden/importer";
 
 import { BrowserOrganizationService } from "../admin-console/services/browser-organization.service";
 import { BrowserPolicyService } from "../admin-console/services/browser-policy.service";
@@ -172,6 +178,8 @@ export default class MainBackground {
   containerService: ContainerService;
   auditService: AuditServiceAbstraction;
   authService: AuthServiceAbstraction;
+  importApiService: ImportApiServiceAbstraction;
+  importService: ImportServiceAbstraction;
   exportService: VaultExportServiceAbstraction;
   searchService: SearchServiceAbstraction;
   notificationsService: NotificationsServiceAbstraction;
@@ -527,6 +535,18 @@ export default class MainBackground {
       this.userVerificationService
     );
     this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
+
+    this.importApiService = new ImportApiService(this.apiService);
+
+    this.importService = new ImportService(
+      this.cipherService,
+      this.folderService,
+      this.importApiService,
+      this.i18nService,
+      this.collectionService,
+      this.cryptoService
+    );
+
     this.exportService = new VaultExportService(
       this.folderService,
       this.cipherService,
@@ -575,6 +595,7 @@ export default class MainBackground {
       this.platformUtilsService as BrowserPlatformUtilsService,
       this.i18nService,
       this.notificationsService,
+      this.stateService,
       this.systemService,
       this.environmentService,
       this.messagingService,
@@ -635,6 +656,7 @@ export default class MainBackground {
         },
         this.authService,
         this.cipherService,
+        this.stateService,
         this.totpService,
         this.eventCollectionService,
         this.userVerificationService
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index dc7ea9a69f9..e921a736f71 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -11,6 +11,7 @@ import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { AutofillService } from "../autofill/services/abstractions/autofill.service";
 import { BrowserApi } from "../platform/browser/browser-api";
 import { BrowserPopoutWindowService } from "../platform/popup/abstractions/browser-popout-window.service";
+import { BrowserStateService } from "../platform/services/abstractions/browser-state.service";
 import { BrowserEnvironmentService } from "../platform/services/browser-environment.service";
 import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service";
 
@@ -29,6 +30,7 @@ export default class RuntimeBackground {
     private platformUtilsService: BrowserPlatformUtilsService,
     private i18nService: I18nService,
     private notificationsService: NotificationsService,
+    private stateService: BrowserStateService,
     private systemService: SystemService,
     private environmentService: BrowserEnvironmentService,
     private messagingService: MessagingService,
@@ -176,6 +178,7 @@ export default class RuntimeBackground {
         switch (msg.sender) {
           case "autofiller":
           case "autofill_cmd": {
+            this.stateService.setLastActive(new Date().getTime());
             const totpCode = await this.autofillService.doAutoFillActiveTab(
               [
                 {
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index b71b8b80b6c..5d0c2f1a519 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -208,6 +208,7 @@ export class BrowserApi {
     name: string,
     callback: (message: any, sender: chrome.runtime.MessageSender, response: any) => void
   ) {
+    // eslint-disable-next-line no-restricted-syntax
     chrome.runtime.onMessage.addListener(callback);
 
     if (BrowserApi.isSafariApi && !BrowserApi.isBackgroundPage(window)) {
@@ -219,6 +220,7 @@ export class BrowserApi {
   static storageChangeListener(
     callback: Parameters<typeof chrome.storage.onChanged.addListener>[0]
   ) {
+    // eslint-disable-next-line no-restricted-syntax
     chrome.storage.onChanged.addListener(callback);
 
     if (BrowserApi.isSafariApi && !BrowserApi.isBackgroundPage(window)) {
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 32eb7670f3c..9dbd87cff57 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -39,7 +39,6 @@ import { SendTypeComponent } from "../tools/popup/send/send-type.component";
 import { ExportComponent } from "../tools/popup/settings/export.component";
 import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component";
 import { CipherRowComponent } from "../vault/popup/components/cipher-row.component";
-import { PasswordRepromptComponent } from "../vault/popup/components/password-reprompt.component";
 import { AddEditCustomFieldsComponent } from "../vault/popup/components/vault/add-edit-custom-fields.component";
 import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
 import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
@@ -125,7 +124,6 @@ import "../platform/popup/locales";
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
     PasswordHistoryComponent,
-    PasswordRepromptComponent,
     PopOutComponent,
     PremiumComponent,
     PrivateModeWarningComponent,
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 0ba396af92f..6770e152504 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -80,11 +80,11 @@ import {
   FolderService,
   InternalFolderService,
 } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { DialogService } from "@bitwarden/components";
 import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export";
+import { ImportServiceAbstraction } from "@bitwarden/importer";
 
 import { BrowserOrganizationService } from "../../admin-console/services/browser-organization.service";
 import { BrowserPolicyService } from "../../admin-console/services/browser-policy.service";
@@ -103,7 +103,6 @@ import BrowserMessagingService from "../../platform/services/browser-messaging.s
 import { BrowserStateService } from "../../platform/services/browser-state.service";
 import { BrowserSendService } from "../../services/browser-send.service";
 import { BrowserSettingsService } from "../../services/browser-settings.service";
-import { PasswordRepromptService } from "../../vault/popup/services/password-reprompt.service";
 import { BrowserFolderService } from "../../vault/services/browser-folder.service";
 import { VaultFilterService } from "../../vault/services/vault-filter.service";
 
@@ -368,6 +367,11 @@ function getBgService<T>(service: keyof MainBackground) {
       useFactory: getBgService<AutofillService>("autofillService"),
       deps: [],
     },
+    {
+      provide: ImportServiceAbstraction,
+      useFactory: getBgService<ImportServiceAbstraction>("importService"),
+      deps: [],
+    },
     {
       provide: VaultExportServiceAbstraction,
       useFactory: getBgService<VaultExportServiceAbstraction>("exportService"),
@@ -403,7 +407,6 @@ function getBgService<T>(service: keyof MainBackground) {
       useFactory: getBgService<ConsoleLogService>("logService"),
       deps: [],
     },
-    { provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
     {
       provide: OrganizationService,
       useFactory: (stateService: StateServiceAbstraction) => {
diff --git a/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts b/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts
new file mode 100644
index 00000000000..4344647bbe8
--- /dev/null
+++ b/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts
@@ -0,0 +1,26 @@
+import { ImportApiService, ImportApiServiceAbstraction } from "@bitwarden/importer";
+
+import {
+  ApiServiceInitOptions,
+  apiServiceFactory,
+} from "../../../platform/background/service-factories/api-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../platform/background/service-factories/factory-options";
+
+export type ImportApiServiceInitOptions = FactoryOptions & ApiServiceInitOptions;
+type ServiceCache = { importApiService?: ImportApiServiceAbstraction } & CachedServices;
+
+export function importApiServiceFactory(
+  cache: ServiceCache,
+  opts: ImportApiServiceInitOptions
+): Promise<ImportApiServiceAbstraction> {
+  return factory(
+    cache,
+    "importApiService",
+    opts,
+    async () => new ImportApiService(await apiServiceFactory(cache, opts))
+  );
+}
diff --git a/apps/browser/src/tools/background/service_factories/import-service.factory.ts b/apps/browser/src/tools/background/service_factories/import-service.factory.ts
new file mode 100644
index 00000000000..3dc9bbd4f0a
--- /dev/null
+++ b/apps/browser/src/tools/background/service_factories/import-service.factory.ts
@@ -0,0 +1,61 @@
+import { ImportService, ImportServiceAbstraction } from "@bitwarden/importer";
+
+import {
+  cryptoServiceFactory,
+  CryptoServiceInitOptions,
+} from "../../../platform/background/service-factories/crypto-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../../platform/background/service-factories/factory-options";
+import {
+  i18nServiceFactory,
+  I18nServiceInitOptions,
+} from "../../../platform/background/service-factories/i18n-service.factory";
+import {
+  cipherServiceFactory,
+  CipherServiceInitOptions,
+} from "../../../vault/background/service_factories/cipher-service.factory";
+import {
+  collectionServiceFactory,
+  CollectionServiceInitOptions,
+} from "../../../vault/background/service_factories/collection-service.factory";
+import {
+  folderServiceFactory,
+  FolderServiceInitOptions,
+} from "../../../vault/background/service_factories/folder-service.factory";
+
+import { importApiServiceFactory, ImportApiServiceInitOptions } from "./import-api-service.factory";
+
+type ImportServiceFactoryOptions = FactoryOptions;
+
+export type ImportServiceInitOptions = ImportServiceFactoryOptions &
+  CipherServiceInitOptions &
+  FolderServiceInitOptions &
+  ImportApiServiceInitOptions &
+  I18nServiceInitOptions &
+  CollectionServiceInitOptions &
+  CryptoServiceInitOptions;
+
+export function importServiceFactory(
+  cache: {
+    importService?: ImportServiceAbstraction;
+  } & CachedServices,
+  opts: ImportServiceInitOptions
+): Promise<ImportServiceAbstraction> {
+  return factory(
+    cache,
+    "importService",
+    opts,
+    async () =>
+      new ImportService(
+        await cipherServiceFactory(cache, opts),
+        await folderServiceFactory(cache, opts),
+        await importApiServiceFactory(cache, opts),
+        await i18nServiceFactory(cache, opts),
+        await collectionServiceFactory(cache, opts),
+        await cryptoServiceFactory(cache, opts)
+      )
+  );
+}
diff --git a/apps/browser/src/vault/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts
index 110e4ef32a5..ff8b7cab0d1 100644
--- a/apps/browser/src/vault/popup/components/action-buttons.component.ts
+++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts
@@ -6,10 +6,10 @@ import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 @Component({
   selector: "app-action-buttons",
diff --git a/apps/browser/src/vault/popup/components/password-reprompt.component.html b/apps/browser/src/vault/popup/components/password-reprompt.component.html
deleted file mode 100644
index 730e96fab96..00000000000
--- a/apps/browser/src/vault/popup/components/password-reprompt.component.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()">
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header">{{ "passwordConfirmation" | i18n }}</h1>
-          <div class="box-content">
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-                <input
-                  id="masterPassword"
-                  type="{{ showPassword ? 'text' : 'password' }}"
-                  name="MasterPassword"
-                  aria-describedby="masterPasswordHelp"
-                  class="monospaced"
-                  [(ngModel)]="masterPassword"
-                  required
-                  appAutofocus
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  (click)="togglePassword()"
-                  [attr.aria-pressed]="showPassword"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-                  ></i>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div id="masterPasswordHelp" class="box-footer">
-            {{ "passwordConfirmationDesc" | i18n }}
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit">
-          <span>{{ "ok" | i18n }}</span>
-        </button>
-        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
-          {{ "cancel" | i18n }}
-        </button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/browser/src/vault/popup/components/password-reprompt.component.ts b/apps/browser/src/vault/popup/components/password-reprompt.component.ts
deleted file mode 100644
index f63da5ed48e..00000000000
--- a/apps/browser/src/vault/popup/components/password-reprompt.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component";
-
-@Component({
-  templateUrl: "password-reprompt.component.html",
-})
-export class PasswordRepromptComponent extends BasePasswordRepromptComponent {}
diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
index f4e9fad5634..fd75b2e8c58 100644
--- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
@@ -17,10 +17,10 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../../platform/browser/browser-api";
 import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
index 4b2c62a0e0d..4f1ceb466de 100644
--- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -11,11 +11,11 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service";
 import { BrowserApi } from "../../../../platform/browser/browser-api";
diff --git a/apps/browser/src/vault/popup/components/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts
index 19c37fc985e..29027b33505 100644
--- a/apps/browser/src/vault/popup/components/vault/view.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/view.component.ts
@@ -20,11 +20,11 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service";
 import { BrowserApi } from "../../../../platform/browser/browser-api";
@@ -331,11 +331,21 @@ export class ViewComponent extends BaseViewComponent {
   }
 
   private async doAutofill() {
+    const originalTabURL = this.tab.url?.length && new URL(this.tab.url);
+
     if (!(await this.promptPassword())) {
       return false;
     }
 
-    if (this.pageDetails == null || this.pageDetails.length === 0) {
+    const currentTabURL = this.tab.url?.length && new URL(this.tab.url);
+
+    const originalTabHostPath =
+      originalTabURL && `${originalTabURL.origin}${originalTabURL.pathname}`;
+    const currentTabHostPath = currentTabURL && `${currentTabURL.origin}${currentTabURL.pathname}`;
+
+    const tabUrlChanged = originalTabHostPath !== currentTabHostPath;
+
+    if (this.pageDetails == null || this.pageDetails.length === 0 || tabUrlChanged) {
       this.platformUtilsService.showToast("error", null, this.i18nService.t("autofillError"));
       return false;
     }
diff --git a/apps/browser/src/vault/popup/services/password-reprompt.service.ts b/apps/browser/src/vault/popup/services/password-reprompt.service.ts
deleted file mode 100644
index 22bbcf44d7f..00000000000
--- a/apps/browser/src/vault/popup/services/password-reprompt.service.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service";
-
-import { PasswordRepromptComponent } from "../components/password-reprompt.component";
-
-@Injectable()
-export class PasswordRepromptService extends BasePasswordRepromptService {
-  component = PasswordRepromptComponent;
-}
diff --git a/apps/browser/store/locales/az/copy.resx b/apps/browser/store/locales/az/copy.resx
index 677ad41b6bc..cb05f8e5d9e 100644
--- a/apps/browser/store/locales/az/copy.resx
+++ b/apps/browser/store/locales/az/copy.resx
@@ -139,7 +139,7 @@ Bitwarden, parolları iş yoldaşlarınızla təhlükəsiz paylaşa bilməyiniz
 Nəyə görə Bitwarden-i seçməliyik:
 
 Yüksək səviyyə şifrələmə
-Parollarınız qabaqcıl bir ucdan digərinə kimi şifrələmə (AES-256 bit, salted hashtag və PBKDF2 SHA-256) ilə qorunur, beləcə verilənlərinizin güvənli və gizli qalmasını təmin edir.
+Parollarınız qabaqcıl ucdan-uca şifrələmə (AES-256 bit, salted hashtag və PBKDF2 SHA-256) ilə qorunur, beləcə datanızın güvənli və gizli qalmasını təmin edir.
 
 Daxili parol yaradıcı
 Çox istifadə etdiyiniz hər veb sayt üçün təhlükəsizlik tələblərinə görə güclü, unikal və təsadüfi şifrələr yaradın.
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 9624939c872..357be6c5281 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -15,7 +15,8 @@
       "@bitwarden/common/*": ["../../libs/common/src/*"],
       "@bitwarden/components": ["../../libs/components/src"],
       "@bitwarden/exporter/*": ["../../libs/exporter/src/*"],
-      "@bitwarden/vault": ["../../libs/auth/src"]
+      "@bitwarden/importer": ["../../libs/importer/src"],
+      "@bitwarden/vault": ["../../libs/vault/src"]
     },
     "useDefineForClassFields": false
   },
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 02f7f6086d4..f38c5cbbd65 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2023.9.1",
+  "version": "2023.9.2",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 6f760ef2b1e..69d1c0074fa 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -19,7 +19,7 @@
     "**/node_modules/@bitwarden/desktop-native/index.js",
     "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node"
   ],
-  "electronVersion": "24.8.5",
+  "electronVersion": "25.9.1",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 444753e9206..68d2cc0f87f 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2023.9.2",
+  "version": "2023.9.3",
   "keywords": [
     "bitwarden",
     "password",
@@ -19,8 +19,10 @@
     "postinstall": "electron-rebuild",
     "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build",
     "build-native": "cd desktop_native && npm run build",
-    "build": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\"",
+    "build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"",
     "build:dev": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"",
+    "build:preload": "cross-env NODE_ENV=production webpack --config webpack.preload.js",
+    "build:preload:watch": "cross-env NODE_ENV=production webpack --config webpack.preload.js --watch",
     "build:main": "cross-env NODE_ENV=production webpack --config webpack.main.js",
     "build:main:dev": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js",
     "build:main:watch": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js --watch",
diff --git a/apps/desktop/scripts/start.js b/apps/desktop/scripts/start.js
index 19b11125061..388bf09405c 100644
--- a/apps/desktop/scripts/start.js
+++ b/apps/desktop/scripts/start.js
@@ -13,6 +13,11 @@ concurrently(
       command: "npm run build:main:watch",
       prefixColor: "yellow",
     },
+    {
+      name: "Prel",
+      command: "npm run build:preload:watch",
+      prefixColor: "magenta",
+    },
     {
       name: "Rend",
       command: "npm run build:renderer:watch",
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 7ccf4aca770..a2a9e71a32b 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -21,7 +21,6 @@ import { DialogService } from "@bitwarden/components";
 
 import { flagEnabled } from "../../platform/flags";
 import { ElectronStateService } from "../../platform/services/electron-state.service.abstraction";
-import { isWindowsStore } from "../../utils";
 import { SetPinComponent } from "../components/set-pin.component";
 @Component({
   selector: "app-settings",
@@ -589,7 +588,7 @@ export class SettingsComponent implements OnInit {
 
       this.form.controls.enableBrowserIntegration.setValue(false);
       return;
-    } else if (isWindowsStore()) {
+    } else if (ipc.platform.isWindowsStore) {
       await this.dialogService.openSimpleDialog({
         title: { key: "browserIntegrationUnsupportedTitle" },
         content: { key: "browserIntegrationWindowsStoreDesc" },
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 34262c3a309..65ac83b59fd 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -10,7 +10,6 @@ import {
 } from "@angular/core";
 import { DomSanitizer } from "@angular/platform-browser";
 import { Router } from "@angular/router";
-import { ipcRenderer } from "electron";
 import { IndividualConfig, ToastrService } from "ngx-toastr";
 import { firstValueFrom, Subject, takeUntil } from "rxjs";
 
@@ -227,7 +226,7 @@ export class AppComponent implements OnInit, OnDestroy {
             this.systemService.cancelProcessReload();
             break;
           case "reloadProcess":
-            ipcRenderer.send("reload-process");
+            ipc.platform.reloadProcess();
             break;
           case "syncStarted":
             break;
diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts
index d14c40854cc..172447822c9 100644
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { TwoFactorOptionsComponent } from "../auth/two-factor-options.component"
 import { TwoFactorComponent } from "../auth/two-factor.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { PremiumComponent } from "../vault/app/accounts/premium.component";
-import { PasswordRepromptComponent } from "../vault/app/components/password-reprompt.component";
 import { AddEditCustomFieldsComponent } from "../vault/app/vault/add-edit-custom-fields.component";
 import { AddEditComponent } from "../vault/app/vault/add-edit.component";
 import { AttachmentsComponent } from "../vault/app/vault/attachments.component";
@@ -79,7 +78,6 @@ import { SendComponent } from "./tools/send/send.component";
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
     PasswordHistoryComponent,
-    PasswordRepromptComponent,
     PremiumComponent,
     RegisterComponent,
     RemovePasswordComponent,
diff --git a/apps/desktop/src/app/main.ts b/apps/desktop/src/app/main.ts
index 7d99e48ea22..c22d4eb9e10 100644
--- a/apps/desktop/src/app/main.ts
+++ b/apps/desktop/src/app/main.ts
@@ -1,8 +1,12 @@
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
+import { ipc } from "../preload";
 import { isDev } from "../utils";
 
+// Temporary polyfill for preload script
+(window as any).ipc = ipc;
+
 require("../scss/styles.scss");
 require("../scss/tailwind.css");
 
diff --git a/apps/desktop/src/app/services/desktop-theming.service.ts b/apps/desktop/src/app/services/desktop-theming.service.ts
index 21277dfd736..3157ad9f661 100644
--- a/apps/desktop/src/app/services/desktop-theming.service.ts
+++ b/apps/desktop/src/app/services/desktop-theming.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from "@angular/core";
-import { ipcRenderer } from "electron";
 
 import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
 import { ThemeType } from "@bitwarden/common/enums";
@@ -7,12 +6,10 @@ import { ThemeType } from "@bitwarden/common/enums";
 @Injectable()
 export class DesktopThemingService extends ThemingService {
   protected async getSystemTheme(): Promise<ThemeType> {
-    return await ipcRenderer.invoke("systemTheme");
+    return await ipc.platform.getSystemTheme();
   }
 
   protected monitorSystemThemeChanges(): void {
-    ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) =>
-      this.updateSystemTheme(theme)
-    );
+    ipc.platform.onSystemThemeUpdated((theme: ThemeType) => this.updateSystemTheme(theme));
   }
 }
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index c6fd0049901..f4841073c9c 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -35,7 +35,6 @@ import { MemoryStorageService } from "@bitwarden/common/platform/services/memory
 import { SystemService } from "@bitwarden/common/platform/services/system.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { DialogService } from "@bitwarden/components";
 
 import { LoginGuard } from "../../auth/guards/login.guard";
@@ -52,7 +51,6 @@ import { I18nService } from "../../platform/services/i18n.service";
 import { EncryptedMessageHandlerService } from "../../services/encrypted-message-handler.service";
 import { NativeMessageHandlerService } from "../../services/native-message-handler.service";
 import { NativeMessagingService } from "../../services/native-messaging.service";
-import { PasswordRepromptService } from "../../vault/services/password-reprompt.service";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
 import { DesktopFileDownloadService } from "./desktop-file-download.service";
@@ -113,7 +111,6 @@ const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
         StateServiceAbstraction,
       ],
     },
-    { provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
     {
       provide: StateServiceAbstraction,
       useClass: ElectronStateService,
diff --git a/apps/desktop/src/auth/two-factor.component.html b/apps/desktop/src/auth/two-factor.component.html
index cd21f91f59e..2b9a1722ee0 100644
--- a/apps/desktop/src/auth/two-factor.component.html
+++ b/apps/desktop/src/auth/two-factor.component.html
@@ -83,7 +83,10 @@
       "
     >
       <div id="duo-frame">
-        <iframe id="duo_iframe" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
+        <iframe
+          id="duo_iframe"
+          sandbox="allow-scripts allow-forms allow-same-origin allow-popups allow-popups-to-escape-sandbox"
+        ></iframe>
       </div>
       <div class="box last">
         <div class="box-content">
diff --git a/apps/desktop/src/global.d.ts b/apps/desktop/src/global.d.ts
index 1b85bb1b6b1..4d103b2cdef 100644
--- a/apps/desktop/src/global.d.ts
+++ b/apps/desktop/src/global.d.ts
@@ -1 +1,2 @@
 declare module "forcefocus";
+declare const ipc: typeof import("./preload").ipc;
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index dad420ca1d1..363159ecbdd 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -476,7 +476,7 @@
     "message": "بیشترین حجم پرونده ۵۰۰ مگابایت است."
   },
   "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+    "message": "انتقال کلید رمزگذاری مورد نیاز است. لطفاً از طریق گاوصندوق وب وارد شوید تا کلید رمزگذاری خود را به روز کنید."
   },
   "editedFolder": {
     "message": "پوشه ذخیره شد"
@@ -1078,7 +1078,7 @@
     "message": "۱ گیگابایت فضای ذخیره‌سازی رمزنگاری شده برای پرونده‌های پیوست."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Proprietary two-step login options such as YubiKey and Duo."
+    "message": "گزینه های ورود اضافی دو مرحله ای مانند YubiKey و Duo."
   },
   "premiumSignUpReports": {
     "message": "گزارش‌های بهداشت رمز عبور، سلامت حساب و نقض داده‌ها برای ایمن نگهداشتن گاوصندوق شما."
@@ -1493,7 +1493,7 @@
     "message": "یک گاوصندوق خارج شده درخواست احراز هویت مجدد را برای دسترسی آن می‌دهد."
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Set up an unlock method to change your vault timeout action."
+    "message": "یک روش بازگشایی برای پایان زمان مجاز تنظیم کنید."
   },
   "lock": {
     "message": "قفل",
@@ -1985,7 +1985,7 @@
     "message": "برون ریزی گاو‌صندوق شخصی"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "فقط موارد شخصی گاوصندوق مرتبط با $EMAIL$ برون ریزی خواهند شد. موارد گاوصندوق سازمان شامل نخواهد شد. فقط اطلاعات مورد گاوصندوق برون ریزی خواهد شد و شامل تاریخچه کلمه عبور مرتبط یا پیوست نمی‌شود.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2110,7 +2110,7 @@
     "message": "با دستگاه دیگری وارد شوید"
   },
   "loginInitiated": {
-    "message": "Login initiated"
+    "message": "ورود به سیستم آغاز شد"
   },
   "notificationSentDevice": {
     "message": "یک اعلان به دستگاه شما ارسال شده است."
@@ -2250,35 +2250,35 @@
     "message": "به‌روز رسانی تنظیمات توصیه شده"
   },
   "deviceApprovalRequired": {
-    "message": "Device approval required. Select an approval option below:"
+    "message": "تأیید دستگاه لازم است. یک روش تأیید انتخاب کنید:"
   },
   "rememberThisDevice": {
-    "message": "Remember this device"
+    "message": "این دستگاه را به خاطر بسپار"
   },
   "uncheckIfPublicDevice": {
-    "message": "Uncheck if using a public device"
+    "message": "اگر از دستگاه عمومی استفاده می‌کنید علامت را بردارید"
   },
   "approveFromYourOtherDevice": {
-    "message": "Approve from your other device"
+    "message": "تأیید با دستگاه دیگرتان"
   },
   "requestAdminApproval": {
-    "message": "Request admin approval"
+    "message": "درخواست تأیید مدیر"
   },
   "approveWithMasterPassword": {
-    "message": "Approve with master password"
+    "message": "تأیید با کلمه عبور اصلی"
   },
   "region": {
-    "message": "Region"
+    "message": "منطقه"
   },
   "ssoIdentifierRequired": {
-    "message": "Organization SSO identifier is required."
+    "message": "شناسه سازمان SSO مورد نیاز است."
   },
   "eu": {
-    "message": "EU",
+    "message": "اروپا",
     "description": "European Union"
   },
   "loggingInOn": {
-    "message": "Logging in on"
+    "message": "ورود با"
   },
   "usDomain": {
     "message": "bitwarden.com"
@@ -2287,46 +2287,46 @@
     "message": "bitwarden.eu"
   },
   "selfHostedServer": {
-    "message": "self-hosted"
+    "message": "خود میزبان"
   },
   "accessDenied": {
     "message": "دسترسی رد شد. شما اجازه مشاهده این صفحه را ندارید."
   },
   "accountSuccessfullyCreated": {
-    "message": "Account successfully created!"
+    "message": "حساب کاربری با موفقیت ایجاد شد!"
   },
   "adminApprovalRequested": {
-    "message": "Admin approval requested"
+    "message": "تأیید مدیر درخواست شد"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Your request has been sent to your admin."
+    "message": "درخواست شما به مدیرتان فرستاده شد."
   },
   "youWillBeNotifiedOnceApproved": {
-    "message": "You will be notified once approved."
+    "message": "به محض تأیید مطلع خواهید شد."
   },
   "troubleLoggingIn": {
-    "message": "Trouble logging in?"
+    "message": "در ورود مشکلی دارید؟"
   },
   "loginApproved": {
-    "message": "Login approved"
+    "message": "ورود تأیید شد"
   },
   "userEmailMissing": {
-    "message": "User email missing"
+    "message": "ایمیل کاربر وجود ندارد"
   },
   "deviceTrusted": {
-    "message": "Device trusted"
+    "message": "دستگاه مورد اعتماد است"
   },
   "inputRequired": {
-    "message": "Input is required."
+    "message": "ورودی ضروری است."
   },
   "required": {
-    "message": "required"
+    "message": "ضروری"
   },
   "search": {
-    "message": "Search"
+    "message": "جستجو"
   },
   "inputMinLength": {
-    "message": "Input must be at least $COUNT$ characters long.",
+    "message": "ورودی باید حداقل $COUNT$ کاراکتر داشته باشد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2335,7 +2335,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "طول ورودی نباید بیش از $COUNT$ کاراکتر باشد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2344,7 +2344,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "The following characters are not allowed: $CHARACTERS$",
+    "message": "کاراکترهای زیر مجاز نیستند: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -2353,7 +2353,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Input value must be at least $MIN$.",
+    "message": "مقدار ورودی باید حداقل $MIN$ باشد.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -2362,7 +2362,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Input value must not exceed $MAX$.",
+    "message": "مقدار ورودی نباید از $MAX$ تجاوز کند.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -2371,17 +2371,17 @@
     }
   },
   "multipleInputEmails": {
-    "message": "1 or more emails are invalid"
+    "message": "یک یا چند ایمیل نامعتبر است"
   },
   "inputTrimValidator": {
-    "message": "Input must not contain only whitespace.",
+    "message": "ورودی نباید فقط حاوی فضای خالی باشد.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "Input is not an email address."
+    "message": "ورودی یک نشانی ایمیل نیست."
   },
   "fieldsNeedAttention": {
-    "message": "$COUNT$ field(s) above need your attention.",
+    "message": "فیلد $COUNT$ در بالا به توجه شما نیاز دارد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2390,22 +2390,22 @@
     }
   },
   "selectPlaceholder": {
-    "message": "-- Select --"
+    "message": "-- انتخاب --"
   },
   "multiSelectPlaceholder": {
-    "message": "-- Type to filter --"
+    "message": "-- برای فیلتر تایپ کنید --"
   },
   "multiSelectLoading": {
-    "message": "Retrieving options..."
+    "message": "در حال بازیابی گزینه‌ها..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "موردی یافت نشد"
   },
   "multiSelectClearAll": {
-    "message": "Clear all"
+    "message": "پاک‌کردن همه"
   },
   "plusNMore": {
-    "message": "+ $QUANTITY$ more",
+    "message": "+ $QUANTITY$ بیشتر",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -2414,9 +2414,9 @@
     }
   },
   "submenu": {
-    "message": "Submenu"
+    "message": "زیرمنو"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "دامنه مستعار"
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index 7ce3fe92ab4..392dbe4a141 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -2417,6 +2417,6 @@
     "message": "Под-мени"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Домен алијаса"
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index 61e50fb0e44..a3489dce44e 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -2417,6 +2417,6 @@
     "message": "Підменю"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Псевдонім домену"
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 2e24b4d9080..f656607fe60 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -594,7 +594,7 @@
     "message": "继续"
   },
   "enterVerificationCodeApp": {
-    "message": "请输入您的身份验证器应用中的 6 位验证码。"
+    "message": "请输入您的验证器应用中的 6 位数验证码。"
   },
   "enterVerificationCodeEmail": {
     "message": "请输入发送给电子邮件 $EMAIL$ 的 6 位数验证码。",
@@ -2083,7 +2083,7 @@
     "message": "密码库"
   },
   "loginWithMasterPassword": {
-    "message": "主密码登录"
+    "message": "使用主密码登录"
   },
   "loggingInAs": {
     "message": "正登录为"
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index 819e81b91f5..3e8cf00867b 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -2119,7 +2119,7 @@
     "message": "Please make sure your vault is unlocked and Fingerprint phrase matches the other device."
   },
   "fingerprintPhraseHeader": {
-    "message": "Fingerprint phrase"
+    "message": "指紋短語"
   },
   "needAnotherOption": {
     "message": "Log in with device must be set up in the settings of the Bitwarden app. Need another option?"
diff --git a/apps/desktop/src/main/window.main.ts b/apps/desktop/src/main/window.main.ts
index 4ea28c74c5f..e326b9e9e1d 100644
--- a/apps/desktop/src/main/window.main.ts
+++ b/apps/desktop/src/main/window.main.ts
@@ -143,6 +143,7 @@ export class WindowMain {
       backgroundColor: await this.getBackgroundColor(),
       alwaysOnTop: this.enableAlwaysOnTop,
       webPreferences: {
+        // preload: path.join(__dirname, "preload.js"),
         spellcheck: false,
         nodeIntegration: true,
         backgroundThrottling: false,
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 6112806d32a..bf2744cd873 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2023.9.2",
+  "version": "2023.9.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2023.9.2",
+      "version": "2023.9.3",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-native": "file:../desktop_native"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 3f4163c160a..9421f7a5277 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2023.9.2",
+  "version": "2023.9.3",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/apps/desktop/src/platform/preload.ts b/apps/desktop/src/platform/preload.ts
new file mode 100644
index 00000000000..1ea4f3b91b4
--- /dev/null
+++ b/apps/desktop/src/platform/preload.ts
@@ -0,0 +1,31 @@
+import { ipcRenderer } from "electron";
+
+import { DeviceType, ThemeType } from "@bitwarden/common/enums";
+
+import { isDev, isWindowsStore } from "../utils";
+
+export default {
+  versions: {
+    app: (): Promise<string> => ipcRenderer.invoke("appVersion"),
+  },
+  deviceType: deviceType(),
+  isDev: isDev(),
+  isWindowsStore: isWindowsStore(),
+  reloadProcess: () => ipcRenderer.send("reload-process"),
+
+  getSystemTheme: (): Promise<ThemeType> => ipcRenderer.invoke("systemTheme"),
+  onSystemThemeUpdated: (callback: (theme: ThemeType) => void) => {
+    ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) => callback(theme));
+  },
+};
+
+function deviceType(): DeviceType {
+  switch (process.platform) {
+    case "win32":
+      return DeviceType.WindowsDesktop;
+    case "darwin":
+      return DeviceType.MacOsDesktop;
+    default:
+      return DeviceType.LinuxDesktop;
+  }
+}
diff --git a/apps/desktop/src/platform/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
index dbc35de9311..6c99507b12b 100644
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -9,31 +9,14 @@ import {
 } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 import { BiometricMessage, BiometricStorageAction } from "../../types/biometric-message";
-import { isDev, isMacAppStore } from "../../utils";
+import { isMacAppStore } from "../../utils";
 import { ClipboardWriteMessage } from "../types/clipboard";
 
 export class ElectronPlatformUtilsService implements PlatformUtilsService {
-  private deviceCache: DeviceType = null;
-
   constructor(protected i18nService: I18nService, private messagingService: MessagingService) {}
 
   getDevice(): DeviceType {
-    if (!this.deviceCache) {
-      switch (process.platform) {
-        case "win32":
-          this.deviceCache = DeviceType.WindowsDesktop;
-          break;
-        case "darwin":
-          this.deviceCache = DeviceType.MacOsDesktop;
-          break;
-        case "linux":
-        default:
-          this.deviceCache = DeviceType.LinuxDesktop;
-          break;
-      }
-    }
-
-    return this.deviceCache;
+    return ipc.platform.deviceType;
   }
 
   getDeviceString(): string {
@@ -82,7 +65,7 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
   }
 
   getApplicationVersion(): Promise<string> {
-    return ipcRenderer.invoke("appVersion");
+    return ipc.platform.versions.app();
   }
 
   async getApplicationVersionNumber(): Promise<string> {
@@ -92,7 +75,7 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
   // Temporarily restricted to only Windows until https://github.com/electron/electron/pull/28349
   // has been merged and an updated electron build is available.
   supportsWebAuthn(win: Window): boolean {
-    return process.platform === "win32";
+    return this.getDevice() === DeviceType.WindowsDesktop;
   }
 
   supportsDuo(): boolean {
@@ -114,7 +97,7 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
   }
 
   isDev(): boolean {
-    return isDev();
+    return ipc.platform.isDev;
   }
 
   isSelfHost(): boolean {
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
new file mode 100644
index 00000000000..a6ddfdefca5
--- /dev/null
+++ b/apps/desktop/src/preload.ts
@@ -0,0 +1,19 @@
+// import { contextBridge } from "electron";
+import platform from "./platform/preload";
+
+/**
+ * Bitwarden Preload script.
+ *
+ * This file contains the "glue" between the main process and the renderer process. Please ensure
+ * that you have read through the following articles before modifying any preload script.
+ *
+ * https://www.electronjs.org/docs/latest/tutorial/tutorial-preload
+ * https://www.electronjs.org/docs/latest/api/context-bridge
+ */
+
+// Each team owns a subspace of the `ipc` global variable in the renderer.
+export const ipc = {
+  platform,
+};
+
+// contextBridge.exposeInMainWorld("ipc", ipc);
diff --git a/apps/desktop/src/scss/list.scss b/apps/desktop/src/scss/list.scss
index ec56eaa6c88..39e520f7d89 100644
--- a/apps/desktop/src/scss/list.scss
+++ b/apps/desktop/src/scss/list.scss
@@ -120,8 +120,12 @@
 
   .item-content {
     display: block;
+    overflow-x: hidden;
     .item-title {
       display: block;
+      overflow-x: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
       .title-badges {
         @include themify($themes) {
           color: themed("mutedColor");
diff --git a/apps/desktop/src/vault/app/components/password-reprompt.component.html b/apps/desktop/src/vault/app/components/password-reprompt.component.html
deleted file mode 100644
index 1ff853c278c..00000000000
--- a/apps/desktop/src/vault/app/components/password-reprompt.component.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordConfirmationTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()">
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header" id="passwordConfirmationTitle">
-            {{ "passwordConfirmation" | i18n }}
-          </h1>
-          <div class="box-content">
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-                <input
-                  id="masterPassword"
-                  type="{{ showPassword ? 'text' : 'password' }}"
-                  name="MasterPassword"
-                  aria-describedby="masterPasswordHelp"
-                  class="monospaced"
-                  [(ngModel)]="masterPassword"
-                  required
-                  appAutofocus
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  [attr.aria-pressed]="showPassword"
-                  (click)="togglePassword()"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-                  ></i>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div id="masterPasswordHelp" class="box-footer">
-            {{ "passwordConfirmationDesc" | i18n }}
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit">
-          <span>{{ "ok" | i18n }}</span>
-        </button>
-        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
-          {{ "cancel" | i18n }}
-        </button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/components/password-reprompt.component.ts b/apps/desktop/src/vault/app/components/password-reprompt.component.ts
deleted file mode 100644
index f63da5ed48e..00000000000
--- a/apps/desktop/src/vault/app/components/password-reprompt.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component";
-
-@Component({
-  templateUrl: "password-reprompt.component.html",
-})
-export class PasswordRepromptComponent extends BasePasswordRepromptComponent {}
diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts
index 8a90d6a7e1a..00ae8022b16 100644
--- a/apps/desktop/src/vault/app/vault/add-edit.component.ts
+++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts
@@ -16,8 +16,8 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 const BroadcasterSubscriptionId = "AddEditComponent";
 
diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts
index 194cee098f7..7930663499d 100644
--- a/apps/desktop/src/vault/app/vault/vault.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault.component.ts
@@ -22,21 +22,21 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { SearchBarService } from "../../../app/layout/search/search-bar.service";
 import { GeneratorComponent } from "../../../app/tools/generator.component";
 import { invokeMenu, RendererMenuItem } from "../../../utils";
-import { CollectionsComponent } from "../../../vault/app/vault/collections.component";
 
 import { AddEditComponent } from "./add-edit.component";
 import { AttachmentsComponent } from "./attachments.component";
+import { CollectionsComponent } from "./collections.component";
 import { FolderAddEditComponent } from "./folder-add-edit.component";
 import { PasswordHistoryComponent } from "./password-history.component";
 import { ShareComponent } from "./share.component";
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
index b6bf63d6e64..adb72dbfe33 100644
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -23,9 +23,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 const BroadcasterSubscriptionId = "ViewComponent";
 
diff --git a/apps/desktop/src/vault/services/password-reprompt.service.ts b/apps/desktop/src/vault/services/password-reprompt.service.ts
deleted file mode 100644
index ebff838d5ca..00000000000
--- a/apps/desktop/src/vault/services/password-reprompt.service.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service";
-
-import { PasswordRepromptComponent } from "../app/components/password-reprompt.component";
-
-@Injectable()
-export class PasswordRepromptService extends BasePasswordRepromptService {
-  component = PasswordRepromptComponent;
-}
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index d587997f9e6..67bfba64426 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -15,6 +15,7 @@
       "@bitwarden/common/*": ["../../libs/common/src/*"],
       "@bitwarden/components": ["../../libs/components/src"],
       "@bitwarden/exporter/*": ["../../libs/exporter/src/*"],
+      "@bitwarden/importer": ["../../libs/importer/src"],
       "@bitwarden/vault": ["../../libs/vault/src"]
     },
     "useDefineForClassFields": false
diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js
index efd1de20d13..59e043fa12e 100644
--- a/apps/desktop/webpack.main.js
+++ b/apps/desktop/webpack.main.js
@@ -67,7 +67,6 @@ const main = {
     ],
   },
   plugins: [
-    new CleanWebpackPlugin(),
     new CopyWebpackPlugin({
       patterns: [
         "./src/package.json",
diff --git a/apps/desktop/webpack.preload.js b/apps/desktop/webpack.preload.js
new file mode 100644
index 00000000000..721d0567ca4
--- /dev/null
+++ b/apps/desktop/webpack.preload.js
@@ -0,0 +1,63 @@
+const path = require("path");
+const { merge } = require("webpack-merge");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const { CleanWebpackPlugin } = require("clean-webpack-plugin");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+const configurator = require("./config/config");
+const { EnvironmentPlugin } = require("webpack");
+
+const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
+
+console.log("Preload process config");
+const envConfig = configurator.load(NODE_ENV);
+configurator.log(envConfig);
+
+const common = {
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: "ts-loader",
+        exclude: /node_modules\/(?!(@bitwarden)\/).*/,
+      },
+    ],
+  },
+  plugins: [],
+  resolve: {
+    extensions: [".tsx", ".ts", ".js"],
+    plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
+  },
+};
+
+const prod = {
+  output: {
+    filename: "[name].js",
+    path: path.resolve(__dirname, "build"),
+  },
+};
+
+const dev = {
+  output: {
+    filename: "[name].js",
+    path: path.resolve(__dirname, "build"),
+    devtoolModuleFilenameTemplate: "[absolute-resource-path]",
+  },
+  devtool: "cheap-source-map",
+};
+
+const main = {
+  mode: NODE_ENV,
+  target: "electron-preload",
+  node: {
+    __dirname: false,
+    __filename: false,
+  },
+  entry: {
+    preload: "./src/preload.ts",
+  },
+  optimization: {
+    minimize: false,
+  },
+};
+
+module.exports = merge(common, NODE_ENV === "development" ? dev : prod, main);
diff --git a/apps/desktop/webpack.renderer.js b/apps/desktop/webpack.renderer.js
index 64eef5729f6..ea1c350c389 100644
--- a/apps/desktop/webpack.renderer.js
+++ b/apps/desktop/webpack.renderer.js
@@ -62,6 +62,8 @@ const common = {
 const renderer = {
   mode: NODE_ENV,
   devtool: "source-map",
+  // TODO: Replace this with web.
+  // target: "web",
   target: "electron-renderer",
   node: {
     __dirname: false,
diff --git a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
index 7feda23f5cf..1606d86497c 100644
--- a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
@@ -45,10 +45,20 @@ const routes: Routes = [
       },
       {
         path: "tools",
-        loadChildren: () =>
-          import("../tools/import-export/org-import-export.module").then(
-            (m) => m.OrganizationImportExportModule
-          ),
+        children: [
+          {
+            path: "import",
+            loadChildren: () =>
+              import("../tools/import/org-import.module").then((m) => m.OrganizationImportModule),
+          },
+          {
+            path: "export",
+            loadChildren: () =>
+              import("../tools/vault-export/org-vault-export.module").then(
+                (m) => m.OrganizationVaultExportModule
+              ),
+          },
+        ],
       },
     ],
   },
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
index c3a687a7f95..c598ce6442a 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
@@ -15,15 +15,17 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
-import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../../billing";
+import { SharedModule } from "../../../shared";
 import {
   DeleteOrganizationDialogResult,
   openDeleteOrganizationDialog,
 } from "../settings/components";
 
 @Component({
-  selector: "families-for-enterprise-setup",
   templateUrl: "families-for-enterprise-setup.component.html",
+  standalone: true,
+  imports: [SharedModule, OrganizationPlansComponent],
 })
 export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
   @ViewChild(OrganizationPlansComponent, { static: false })
diff --git a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts
index cf721098a2c..415bd6516c2 100644
--- a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts
@@ -6,9 +6,9 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 // eslint-disable-next-line no-restricted-imports
 import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../../reports/pages/exposed-passwords-report.component";
diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts b/apps/web/src/app/admin-console/organizations/tools/import/org-import-routing.module.ts
similarity index 53%
rename from apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts
rename to apps/web/src/app/admin-console/organizations/tools/import/org-import-routing.module.ts
index c0430ab2e07..9b4b4b5c787 100644
--- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/import/org-import-routing.module.ts
@@ -3,14 +3,13 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
-import { OrganizationPermissionsGuard } from "../../../../admin-console/organizations/guards/org-permissions.guard";
+import { OrganizationPermissionsGuard } from "../../guards/org-permissions.guard";
 
-import { OrganizationExportComponent } from "./org-export.component";
 import { OrganizationImportComponent } from "./org-import.component";
 
 const routes: Routes = [
   {
-    path: "import",
+    path: "",
     component: OrganizationImportComponent,
     canActivate: [OrganizationPermissionsGuard],
     data: {
@@ -18,18 +17,9 @@ const routes: Routes = [
       organizationPermissions: (org: Organization) => org.canAccessImportExport,
     },
   },
-  {
-    path: "export",
-    component: OrganizationExportComponent,
-    canActivate: [OrganizationPermissionsGuard],
-    data: {
-      titleId: "exportVault",
-      organizationPermissions: (org: Organization) => org.canAccessImportExport,
-    },
-  },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
 })
-export class OrganizationImportExportRoutingModule {}
+export class OrganizationImportRoutingModule {}
diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts b/apps/web/src/app/admin-console/organizations/tools/import/org-import.component.ts
similarity index 95%
rename from apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts
rename to apps/web/src/app/admin-console/organizations/tools/import/org-import.component.ts
index e8dad8baf41..b514f2bcf38 100644
--- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/import/org-import.component.ts
@@ -18,11 +18,11 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
 import { DialogService } from "@bitwarden/components";
 import { ImportServiceAbstraction } from "@bitwarden/importer";
 
-import { ImportComponent } from "../../../../tools/import-export/import.component";
+import { ImportComponent } from "../../../../tools/import/import.component";
 
 @Component({
   selector: "app-org-import",
-  templateUrl: "../../../../tools/import-export/import.component.html",
+  templateUrl: "../../../../tools/import/import.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class OrganizationImportComponent extends ImportComponent {
diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts b/apps/web/src/app/admin-console/organizations/tools/import/org-import.module.ts
similarity index 81%
rename from apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts
rename to apps/web/src/app/admin-console/organizations/tools/import/org-import.module.ts
index e40e961ac98..66a22158e20 100644
--- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/import/org-import.module.ts
@@ -15,13 +15,12 @@ import {
 
 import { LooseComponentsModule, SharedModule } from "../../../../shared";
 
-import { OrganizationExportComponent } from "./org-export.component";
-import { OrganizationImportExportRoutingModule } from "./org-import-export-routing.module";
+import { OrganizationImportRoutingModule } from "./org-import-routing.module";
 import { OrganizationImportComponent } from "./org-import.component";
 
 @NgModule({
-  imports: [SharedModule, LooseComponentsModule, OrganizationImportExportRoutingModule],
-  declarations: [OrganizationImportComponent, OrganizationExportComponent],
+  imports: [SharedModule, LooseComponentsModule, OrganizationImportRoutingModule],
+  declarations: [OrganizationImportComponent],
   providers: [
     {
       provide: ImportApiServiceAbstraction,
@@ -42,4 +41,4 @@ import { OrganizationImportComponent } from "./org-import.component";
     },
   ],
 })
-export class OrganizationImportExportModule {}
+export class OrganizationImportModule {}
diff --git a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts
index 9d62073e066..4cc68b1f9d0 100644
--- a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts
@@ -6,8 +6,8 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 // eslint-disable-next-line no-restricted-imports
 import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../reports/pages/inactive-two-factor-report.component";
diff --git a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts
index b410b63e0ff..93652239a11 100644
--- a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts
@@ -6,9 +6,9 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 // eslint-disable-next-line no-restricted-imports
 import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../reports/pages/reused-passwords-report.component";
diff --git a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts
index 53ce0304507..e8fbc0ed5e6 100644
--- a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts
@@ -5,8 +5,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 // eslint-disable-next-line no-restricted-imports
 import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../reports/pages/unsecured-websites-report.component";
diff --git a/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export-routing.module.ts b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export-routing.module.ts
new file mode 100644
index 00000000000..e3e809a550d
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export-routing.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+
+import { OrganizationPermissionsGuard } from "../../guards/org-permissions.guard";
+
+import { OrganizationVaultExportComponent } from "./org-vault-export.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: OrganizationVaultExportComponent,
+    canActivate: [OrganizationPermissionsGuard],
+    data: {
+      titleId: "exportVault",
+      organizationPermissions: (org: Organization) => org.canAccessImportExport,
+    },
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+})
+export class OrganizationVaultExportRoutingModule {}
diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
similarity index 92%
rename from apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts
rename to apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
index 9ea1442fd13..ae91150f608 100644
--- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
@@ -14,14 +14,14 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { DialogService } from "@bitwarden/components";
 import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export";
 
-import { ExportComponent } from "../../../../tools/import-export/export.component";
+import { ExportComponent } from "../../../../tools/vault-export/export.component";
 
 @Component({
   selector: "app-org-export",
-  templateUrl: "../../../../tools/import-export/export.component.html",
+  templateUrl: "../../../../tools/vault-export/export.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-export class OrganizationExportComponent extends ExportComponent {
+export class OrganizationVaultExportComponent extends ExportComponent {
   constructor(
     cryptoService: CryptoService,
     i18nService: I18nService,
diff --git a/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.module.ts b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.module.ts
new file mode 100644
index 00000000000..34b4fa4adba
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from "@angular/core";
+
+import { LooseComponentsModule, SharedModule } from "../../../../shared";
+
+import { OrganizationVaultExportRoutingModule } from "./org-vault-export-routing.module";
+import { OrganizationVaultExportComponent } from "./org-vault-export.component";
+
+@NgModule({
+  imports: [SharedModule, LooseComponentsModule, OrganizationVaultExportRoutingModule],
+  declarations: [OrganizationVaultExportComponent],
+})
+export class OrganizationVaultExportModule {}
diff --git a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts
index 68619b27514..540f71d91dc 100644
--- a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts
@@ -6,9 +6,9 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 // eslint-disable-next-line no-restricted-imports
 import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../reports/pages/weak-passwords-report.component";
diff --git a/apps/web/src/app/admin-console/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts
index c7fc53c5256..7728ddc540a 100644
--- a/apps/web/src/app/admin-console/settings/create-organization.component.ts
+++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts
@@ -5,11 +5,13 @@ import { first } from "rxjs/operators";
 import { PlanType } from "@bitwarden/common/billing/enums";
 import { ProductType } from "@bitwarden/common/enums";
 
-import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../billing";
+import { SharedModule } from "../../shared";
 
 @Component({
-  selector: "app-create-organization",
   templateUrl: "create-organization.component.html",
+  standalone: true,
+  imports: [SharedModule, OrganizationPlansComponent],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class CreateOrganizationComponent implements OnInit {
diff --git a/apps/web/src/app/auth/auth.module.ts b/apps/web/src/app/auth/auth.module.ts
index 49be17aa264..056b9f161f9 100644
--- a/apps/web/src/app/auth/auth.module.ts
+++ b/apps/web/src/app/auth/auth.module.ts
@@ -1,12 +1,11 @@
 import { NgModule } from "@angular/core";
 
-import { CoreAuthModule } from "./core";
-import { SettingsModule } from "./settings/settings.module";
+import { AuthSettingsModule } from "./settings/settings.module";
 
 @NgModule({
-  imports: [CoreAuthModule, SettingsModule],
+  imports: [AuthSettingsModule],
   declarations: [],
   providers: [],
-  exports: [SettingsModule],
+  exports: [AuthSettingsModule],
 })
 export class AuthModule {}
diff --git a/apps/web/src/app/auth/core/index.ts b/apps/web/src/app/auth/core/index.ts
index 3d2d739adf9..b2221a94a89 100644
--- a/apps/web/src/app/auth/core/index.ts
+++ b/apps/web/src/app/auth/core/index.ts
@@ -1,2 +1 @@
 export * from "./services";
-export * from "./core.module";
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-api.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-api.service.ts
index 33e1aea369b..6dc61563491 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-api.service.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-api.service.ts
@@ -1,25 +1,20 @@
 import { Injectable } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { Verification } from "@bitwarden/common/types/verification";
 
 import { SaveCredentialRequest } from "./request/save-credential.request";
 import { WebauthnLoginCredentialCreateOptionsResponse } from "./response/webauthn-login-credential-create-options.response";
 import { WebauthnLoginCredentialResponse } from "./response/webauthn-login-credential.response";
 
-@Injectable()
+@Injectable({ providedIn: "root" })
 export class WebauthnLoginApiService {
-  constructor(
-    private apiService: ApiService,
-    private userVerificationService: UserVerificationService
-  ) {}
+  constructor(private apiService: ApiService) {}
 
   async getCredentialCreateOptions(
-    verification: Verification
+    request: SecretVerificationRequest
   ): Promise<WebauthnLoginCredentialCreateOptionsResponse> {
-    const request = await this.userVerificationService.buildRequest(verification);
     const response = await this.apiService.send("POST", "/webauthn/options", request, true, true);
     return new WebauthnLoginCredentialCreateOptionsResponse(response);
   }
@@ -33,8 +28,7 @@ export class WebauthnLoginApiService {
     return this.apiService.send("GET", "/webauthn", null, true, true);
   }
 
-  async deleteCredential(credentialId: string, verification: Verification): Promise<void> {
-    const request = await this.userVerificationService.buildRequest(verification);
+  async deleteCredential(credentialId: string, request: SecretVerificationRequest): Promise<void> {
     await this.apiService.send("POST", `/webauthn/${credentialId}/delete`, request, true, true);
   }
 }
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.spec.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.spec.ts
index 070513f19e8..1e4f1fa7717 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.spec.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.spec.ts
@@ -1,5 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+
 import { CredentialCreateOptionsView } from "../../views/credential-create-options.view";
 
 import { WebauthnLoginApiService } from "./webauthn-login-api.service";
@@ -7,6 +9,7 @@ import { WebauthnLoginService } from "./webauthn-login.service";
 
 describe("WebauthnService", () => {
   let apiService!: MockProxy<WebauthnLoginApiService>;
+  let userVerificationService!: MockProxy<UserVerificationService>;
   let credentials: MockProxy<CredentialsContainer>;
   let webauthnService!: WebauthnLoginService;
 
@@ -15,8 +18,9 @@ describe("WebauthnService", () => {
     window.PublicKeyCredential = class {} as any;
     window.AuthenticatorAttestationResponse = class {} as any;
     apiService = mock<WebauthnLoginApiService>();
+    userVerificationService = mock<UserVerificationService>();
     credentials = mock<CredentialsContainer>();
-    webauthnService = new WebauthnLoginService(apiService, credentials);
+    webauthnService = new WebauthnLoginService(apiService, userVerificationService, credentials);
   });
 
   describe("createCredential", () => {
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.ts
index 760214961a7..c5979f08c61 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login.service.ts
@@ -1,6 +1,7 @@
 import { Injectable, Optional } from "@angular/core";
 import { BehaviorSubject, filter, from, map, Observable, shareReplay, switchMap, tap } from "rxjs";
 
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Verification } from "@bitwarden/common/types/verification";
 
@@ -11,8 +12,10 @@ import { SaveCredentialRequest } from "./request/save-credential.request";
 import { WebauthnLoginAttestationResponseRequest } from "./request/webauthn-login-attestation-response.request";
 import { WebauthnLoginApiService } from "./webauthn-login-api.service";
 
-@Injectable()
+@Injectable({ providedIn: "root" })
 export class WebauthnLoginService {
+  static readonly MaxCredentialCount = 5;
+
   private navigatorCredentials: CredentialsContainer;
   private _refresh$ = new BehaviorSubject<void>(undefined);
   private _loading$ = new BehaviorSubject<boolean>(true);
@@ -27,6 +30,7 @@ export class WebauthnLoginService {
 
   constructor(
     private apiService: WebauthnLoginApiService,
+    private userVerificationService: UserVerificationService,
     @Optional() navigatorCredentials?: CredentialsContainer,
     @Optional() private logService?: LogService
   ) {
@@ -37,7 +41,8 @@ export class WebauthnLoginService {
   async getCredentialCreateOptions(
     verification: Verification
   ): Promise<CredentialCreateOptionsView> {
-    const response = await this.apiService.getCredentialCreateOptions(verification);
+    const request = await this.userVerificationService.buildRequest(verification);
+    const response = await this.apiService.getCredentialCreateOptions(request);
     return new CredentialCreateOptionsView(response.options, response.token);
   }
 
@@ -95,7 +100,8 @@ export class WebauthnLoginService {
   }
 
   async deleteCredential(credentialId: string, verification: Verification): Promise<void> {
-    await this.apiService.deleteCredential(credentialId, verification);
+    const request = await this.userVerificationService.buildRequest(verification);
+    await this.apiService.deleteCredential(credentialId, request);
     this.refresh();
   }
 
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts
index 925ebbf3ea6..fdb72518b19 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts
@@ -15,9 +15,9 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AddEditComponent as BaseAddEditComponent } from "../../../vault/individual-vault/add-edit.component";
 
diff --git a/apps/web/src/app/auth/settings/settings.module.ts b/apps/web/src/app/auth/settings/settings.module.ts
index 2091b078328..12ae6bcbf5e 100644
--- a/apps/web/src/app/auth/settings/settings.module.ts
+++ b/apps/web/src/app/auth/settings/settings.module.ts
@@ -1,14 +1,16 @@
 import { NgModule } from "@angular/core";
 
+import { PasswordCalloutComponent } from "@bitwarden/auth";
+
 import { SharedModule } from "../../shared";
 
 import { ChangePasswordComponent } from "./change-password.component";
 import { WebauthnLoginSettingsModule } from "./webauthn-login-settings";
 
 @NgModule({
-  imports: [SharedModule, WebauthnLoginSettingsModule],
+  imports: [SharedModule, WebauthnLoginSettingsModule, PasswordCalloutComponent],
   declarations: [ChangePasswordComponent],
   providers: [],
-  exports: [WebauthnLoginSettingsModule, ChangePasswordComponent],
+  exports: [ChangePasswordComponent],
 })
-export class SettingsModule {}
+export class AuthSettingsModule {}
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
index 57a2c545ca1..aadcf5e5960 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="large">
+  <bit-dialog dialogSize="large" [loading]="loading$ | async">
     <span bitDialogTitle
       >{{ "loginWithPasskey" | i18n }}
       <span class="tw-text-sm tw-normal-case tw-text-muted">{{ "newPasskey" | i18n }}</span>
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
index cdecc9ebeaa..12af83cac5c 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -46,6 +46,7 @@ export class CreateCredentialDialogComponent implements OnInit {
   protected credentialOptions?: CredentialCreateOptionsView;
   protected deviceResponse?: PublicKeyCredential;
   protected hasPasskeys$?: Observable<boolean>;
+  protected loading$ = this.webauthnService.loading$;
 
   constructor(
     private formBuilder: FormBuilder,
@@ -144,7 +145,7 @@ export class CreateCredentialDialogComponent implements OnInit {
       return;
     }
 
-    if (firstValueFrom(this.hasPasskeys$)) {
+    if (await firstValueFrom(this.hasPasskeys$)) {
       this.platformUtilsService.showToast(
         "success",
         null,
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.html
index 4cfdbbcf7fe..5e87f6d4adf 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="large">
+  <bit-dialog dialogSize="large" [loading]="loading$ | async">
     <span bitDialogTitle
       >{{ "removePasskey" | i18n }}
       <span *ngIf="credential" class="tw-text-sm tw-normal-case tw-text-muted">{{
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
index 7cb03238392..9ee1337ffb2 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
@@ -27,6 +27,7 @@ export class DeleteCredentialDialogComponent implements OnInit, OnDestroy {
     masterPassword: ["", [Validators.required]],
   });
   protected credential?: WebauthnCredentialView;
+  protected loading$ = this.webauthnService.loading$;
 
   constructor(
     @Inject(DIALOG_DATA) private params: DeleteCredentialDialogParams,
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
index 23abe02665c..5896d461bfb 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
@@ -22,7 +22,7 @@
 <table *ngIf="hasCredentials" class="tw-mb-5">
   <tr *ngFor="let credential of credentials">
     <td class="tw-p-2 tw-pl-0 tw-font-semibold">{{ credential.name }}</td>
-    <td class="tw-p-2 tw-pr-0">
+    <td class="tw-p-2 tw-pr-10">
       <ng-container *ngIf="credential.prfSupport">
         <i class="bwi bwi-lock-encrypted"></i>
         {{ "supportsEncryption" | i18n }}
@@ -31,7 +31,7 @@
         {{ "encryptionNotSupported" | i18n }}
       </span>
     </td>
-    <td class="tw-py-2 tw-pl-10 tw-pr-0">
+    <td class="tw-py-2">
       <button
         type="button"
         bitLink
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
index 98aa517b98e..1aa4356c667 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
@@ -19,7 +19,7 @@ import { openDeleteCredentialDialogComponent } from "./delete-credential-dialog/
 export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
-  protected readonly MaxCredentialCount = 5;
+  protected readonly MaxCredentialCount = WebauthnLoginService.MaxCredentialCount;
 
   protected credentials?: WebauthnCredentialView[];
   protected loading = true;
diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
index 222ad94923c..426ce3e2e7c 100644
--- a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
@@ -6,9 +6,10 @@ import { FormFieldModule } from "@bitwarden/components";
 
 import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
 import { RegisterFormModule } from "../../auth/register-form/register-form.module";
+import { PaymentComponent, TaxInfoComponent } from "../../billing";
 import { BillingComponent } from "../../billing/accounts/trial-initiation/billing.component";
 import { EnvironmentSelectorModule } from "../../components/environment-selector/environment-selector.module";
-import { LooseComponentsModule, SharedModule } from "../../shared";
+import { SharedModule } from "../../shared";
 
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
 import { AbmEnterpriseContentComponent } from "./content/abm-enterprise-content.component";
@@ -37,8 +38,9 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
     FormFieldModule,
     RegisterFormModule,
     OrganizationCreateModule,
-    LooseComponentsModule,
     EnvironmentSelectorModule,
+    PaymentComponent,
+    TaxInfoComponent,
   ],
   declarations: [
     TrialInitiationComponent,
diff --git a/apps/web/src/app/auth/two-factor.component.html b/apps/web/src/app/auth/two-factor.component.html
index e3617a16589..99d40e1f3e0 100644
--- a/apps/web/src/app/auth/two-factor.component.html
+++ b/apps/web/src/app/auth/two-factor.component.html
@@ -92,7 +92,7 @@
             <div id="duo-frame" class="mb-3">
               <iframe
                 id="duo_iframe"
-                sandbox="allow-scripts allow-forms allow-same-origin"
+                sandbox="allow-scripts allow-forms allow-same-origin allow-popups allow-popups-to-escape-sandbox"
               ></iframe>
             </div>
           </ng-container>
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts
index 1830b49a45b..2e540191651 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts
+++ b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts
@@ -3,7 +3,7 @@ import { FormGroup } from "@angular/forms";
 
 import { ProductType } from "@bitwarden/common/enums";
 
-import { OrganizationPlansComponent } from "../../settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../organizations";
 
 @Component({
   selector: "app-billing",
diff --git a/apps/web/src/app/billing/index.ts b/apps/web/src/app/billing/index.ts
new file mode 100644
index 00000000000..b59ab33e54c
--- /dev/null
+++ b/apps/web/src/app/billing/index.ts
@@ -0,0 +1,2 @@
+export { OrganizationPlansComponent } from "./organizations";
+export { PaymentComponent, TaxInfoComponent } from "./shared";
diff --git a/apps/web/src/app/billing/settings/billing-history-view.component.html b/apps/web/src/app/billing/individual/billing-history-view.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/billing-history-view.component.html
rename to apps/web/src/app/billing/individual/billing-history-view.component.html
diff --git a/apps/web/src/app/billing/settings/billing-history-view.component.ts b/apps/web/src/app/billing/individual/billing-history-view.component.ts
similarity index 96%
rename from apps/web/src/app/billing/settings/billing-history-view.component.ts
rename to apps/web/src/app/billing/individual/billing-history-view.component.ts
index 0c64e3f92e0..a2442bcd4b6 100644
--- a/apps/web/src/app/billing/settings/billing-history-view.component.ts
+++ b/apps/web/src/app/billing/individual/billing-history-view.component.ts
@@ -6,7 +6,6 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 @Component({
-  selector: "app-billing-history-view",
   templateUrl: "billing-history-view.component.html",
 })
 export class BillingHistoryViewComponent implements OnInit {
diff --git a/apps/web/src/app/billing/individual/index.ts b/apps/web/src/app/billing/individual/index.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apps/web/src/app/billing/settings/subscription-routing.module.ts b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
similarity index 71%
rename from apps/web/src/app/billing/settings/subscription-routing.module.ts
rename to apps/web/src/app/billing/individual/individual-billing-routing.module.ts
index 5664cb89cd4..ff45ca75ac6 100644
--- a/apps/web/src/app/billing/settings/subscription-routing.module.ts
+++ b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
@@ -1,12 +1,12 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component";
-import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
-import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component";
-import { PremiumComponent } from "../settings/premium.component";
+import { PaymentMethodComponent } from "../shared";
 
+import { BillingHistoryViewComponent } from "./billing-history-view.component";
+import { PremiumComponent } from "./premium.component";
 import { SubscriptionComponent } from "./subscription.component";
+import { UserSubscriptionComponent } from "./user-subscription.component";
 
 const routes: Routes = [
   {
@@ -43,4 +43,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class SubscriptionRoutingModule {}
+export class IndividualBillingRoutingModule {}
diff --git a/apps/web/src/app/billing/individual/individual-billing.module.ts b/apps/web/src/app/billing/individual/individual-billing.module.ts
new file mode 100644
index 00000000000..15837d03829
--- /dev/null
+++ b/apps/web/src/app/billing/individual/individual-billing.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from "@angular/core";
+
+import { BillingSharedModule } from "../shared";
+
+import { BillingHistoryViewComponent } from "./billing-history-view.component";
+import { IndividualBillingRoutingModule } from "./individual-billing-routing.module";
+import { PremiumComponent } from "./premium.component";
+import { SubscriptionComponent } from "./subscription.component";
+import { UserSubscriptionComponent } from "./user-subscription.component";
+
+@NgModule({
+  imports: [IndividualBillingRoutingModule, BillingSharedModule],
+  declarations: [
+    SubscriptionComponent,
+    BillingHistoryViewComponent,
+    UserSubscriptionComponent,
+    PremiumComponent,
+  ],
+})
+export class IndividualBillingModule {}
diff --git a/apps/web/src/app/billing/settings/premium.component.html b/apps/web/src/app/billing/individual/premium.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/premium.component.html
rename to apps/web/src/app/billing/individual/premium.component.html
diff --git a/apps/web/src/app/billing/settings/premium.component.ts b/apps/web/src/app/billing/individual/premium.component.ts
similarity index 97%
rename from apps/web/src/app/billing/settings/premium.component.ts
rename to apps/web/src/app/billing/individual/premium.component.ts
index 311985c317e..4044caa1db3 100644
--- a/apps/web/src/app/billing/settings/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium.component.ts
@@ -11,11 +11,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
-import { PaymentComponent } from "./payment.component";
-import { TaxInfoComponent } from "./tax-info.component";
+import { PaymentComponent, TaxInfoComponent } from "../shared";
 
 @Component({
-  selector: "app-premium",
   templateUrl: "premium.component.html",
 })
 export class PremiumComponent implements OnInit {
diff --git a/apps/web/src/app/billing/settings/subscription.component.html b/apps/web/src/app/billing/individual/subscription.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/subscription.component.html
rename to apps/web/src/app/billing/individual/subscription.component.html
diff --git a/apps/web/src/app/billing/settings/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts
similarity index 95%
rename from apps/web/src/app/billing/settings/subscription.component.ts
rename to apps/web/src/app/billing/individual/subscription.component.ts
index a6d5f13eae6..94381fbce5e 100644
--- a/apps/web/src/app/billing/settings/subscription.component.ts
+++ b/apps/web/src/app/billing/individual/subscription.component.ts
@@ -4,7 +4,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 
 @Component({
-  selector: "app-subscription",
   templateUrl: "subscription.component.html",
 })
 export class SubscriptionComponent {
diff --git a/apps/web/src/app/billing/settings/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/user-subscription.component.html
rename to apps/web/src/app/billing/individual/user-subscription.component.html
diff --git a/apps/web/src/app/billing/settings/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts
similarity index 99%
rename from apps/web/src/app/billing/settings/user-subscription.component.ts
rename to apps/web/src/app/billing/individual/user-subscription.component.ts
index 2e2a12a7b0d..5b4b7cf49ef 100644
--- a/apps/web/src/app/billing/settings/user-subscription.component.ts
+++ b/apps/web/src/app/billing/individual/user-subscription.component.ts
@@ -12,7 +12,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { DialogService } from "@bitwarden/components";
 
 @Component({
-  selector: "app-user-subscription",
   templateUrl: "user-subscription.component.html",
 })
 export class UserSubscriptionComponent implements OnInit {
diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.html b/apps/web/src/app/billing/organizations/adjust-subscription.component.html
index 148d507a6a8..6f0da673758 100644
--- a/apps/web/src/app/billing/organizations/adjust-subscription.component.html
+++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.html
@@ -14,7 +14,7 @@
           required
         />
         <small class="d-block text-muted mb-4">
-          <strong>{{ "total" | i18n }}:</strong> {{ newSeatCount || 0 }} &times;
+          <strong>{{ "total" | i18n }}:</strong> {{ additionalSeatCount || 0 }} &times;
           {{ seatPrice | currency : "$" }} = {{ adjustedSeatTotal | currency : "$" }} /
           {{ interval | i18n }}
         </small>
@@ -50,7 +50,7 @@
           [required]="limitSubscription"
         />
         <small class="d-block text-muted">
-          <strong>{{ "maxSeatCost" | i18n }}:</strong> {{ newMaxSeats || 0 }} &times;
+          <strong>{{ "maxSeatCost" | i18n }}:</strong> {{ additionalMaxSeatCount || 0 }} &times;
           {{ seatPrice | currency : "$" }} = {{ maxSeatTotal | currency : "$" }} /
           {{ interval | i18n }}
         </small>
diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
index c82f30665d6..a6f67e0138a 100644
--- a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
+++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
@@ -38,8 +38,10 @@ export class AdjustSubscription {
 
   async submit() {
     try {
-      const seatAdjustment = this.newSeatCount - this.currentSeatCount;
-      const request = new OrganizationSubscriptionUpdateRequest(seatAdjustment, this.newMaxSeats);
+      const request = new OrganizationSubscriptionUpdateRequest(
+        this.additionalSeatCount,
+        this.newMaxSeats
+      );
       this.formPromise = this.organizationApiService.updatePasswordManagerSeats(
         this.organizationId,
         request
@@ -64,11 +66,19 @@ export class AdjustSubscription {
     }
   }
 
+  get additionalSeatCount(): number {
+    return this.newSeatCount ? this.newSeatCount - this.currentSeatCount : 0;
+  }
+
+  get additionalMaxSeatCount(): number {
+    return this.newMaxSeats ? this.newMaxSeats - this.currentSeatCount : 0;
+  }
+
   get adjustedSeatTotal(): number {
-    return this.newSeatCount * this.seatPrice;
+    return this.additionalSeatCount * this.seatPrice;
   }
 
   get maxSeatTotal(): number {
-    return this.newMaxSeats * this.seatPrice;
+    return this.additionalMaxSeatCount * this.seatPrice;
   }
 }
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
index a196845a395..f5225bc29a0 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
@@ -1,117 +1,75 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="billingSyncApiKeyTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <form
-      class="modal-content"
-      #form
-      (ngSubmit)="submit()"
-      [appApiAction]="formPromise"
-      ngNativeValidate
-    >
-      <div class="modal-header">
-        <h1 class="modal-title" id="billingSyncApiKeyTitle">
-          {{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | i18n }}
-        </h1>
-        <button
-          type="button"
-          class="close"
-          data-dismiss="modal"
-          appA11yTitle="{{ 'close' | i18n }}"
-        >
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <app-user-verification
-          [(ngModel)]="masterPassword"
-          ngDefaultControl
-          name="secret"
-          *ngIf="!clientSecret"
-        >
-        </app-user-verification>
-        <ng-container *ngIf="clientSecret && showRotateScreen">
-          <p>{{ "rotateBillingSyncTokenTitle" | i18n }}</p>
-          <app-callout type="warning">
-            {{ "rotateBillingSyncTokenWarning" | i18n }}
-          </app-callout>
-        </ng-container>
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-dialog>
+    <h1 bitDialogTitle>
+      {{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | i18n }}
+    </h1>
+    <div bitDialogContent>
+      <app-user-verification formControlName="verification" *ngIf="!clientSecret">
+      </app-user-verification>
 
-        <div *ngIf="clientSecret && !showRotateScreen">
-          <p>{{ "copyPasteBillingSync" | i18n }}</p>
-          <label for="clientSecret">{{ "billingSyncKey" | i18n }}</label>
-          <div class="input-group">
-            <input
-              id="clientSecret"
-              class="form-control text-monospace"
-              type="text"
-              [(ngModel)]="clientSecret"
-              name="clientSecret"
-              disabled
-            />
-            <div class="input-group-append">
-              <button
-                type="button"
-                class="btn btn-outline-secondary"
-                (click)="copy()"
-                [appA11yTitle]="'copy' | i18n"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div class="small text-muted mt-2" *ngIf="showLastSyncText">
-            <b class="font-weight-semibold">{{ "lastSync" | i18n }}:</b>
-            {{ lastSyncDate | date : "medium" }}
-          </div>
-          <div class="small text-danger mt-2" *ngIf="showAwaitingSyncText">
-            <i class="bwi bwi-error"></i>
-            {{
-              (daysBetween === 1 ? "awaitingSyncSingular" : "awaitingSyncPlural")
-                | i18n : daysBetween
-            }}
-          </div>
+      <ng-container *ngIf="clientSecret && showRotateScreen">
+        <p>{{ "rotateBillingSyncTokenTitle" | i18n }}</p>
+        <bit-callout type="warning">
+          {{ "rotateBillingSyncTokenWarning" | i18n }}
+        </bit-callout>
+      </ng-container>
+
+      <div *ngIf="clientSecret && !showRotateScreen">
+        <p>{{ "copyPasteBillingSync" | i18n }}</p>
+        <bit-form-field>
+          <bit-label>{{ "billingSyncKey" | i18n }}</bit-label>
+          <input
+            bitInput
+            id="clientSecret"
+            type="text"
+            [value]="clientSecret"
+            class="tw-font-mono"
+            disabled
+          />
+          <button
+            bitIconButton="bwi-clone"
+            bitSuffix
+            type="button"
+            [appCopyClick]="clientSecret"
+            [appA11yTitle]="'copyValue' | i18n"
+          ></button>
+        </bit-form-field>
+        <div class="tw-mt-2 tw-text-sm tw-text-muted" *ngIf="showLastSyncText">
+          <b class="tw-font-semibold">{{ "lastSync" | i18n }}:</b>
+          {{ lastSyncDate | date : "medium" }}
+        </div>
+        <div class="tw-mt-2 tw-text-sm tw-text-danger" *ngIf="showAwaitingSyncText">
+          <i class="bwi bwi-error"></i>
+          {{
+            (daysBetween === 1 ? "awaitingSyncSingular" : "awaitingSyncPlural") | i18n : daysBetween
+          }}
         </div>
       </div>
-      <div class="modal-footer">
-        <button
-          type="submit"
-          class="btn btn-primary btn-submit"
-          [disabled]="form.loading"
-          *ngIf="!clientSecret || showRotateScreen"
-        >
-          <i
-            class="bwi bwi-spinner bwi-spin"
-            title="{{ 'loading' | i18n }}"
-            *ngIf="form.loading"
-          ></i>
-          <span>
-            {{ submitButtonText }}
-          </span>
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          data-dismiss="modal"
-          *ngIf="!showRotateScreen"
-        >
-          {{ "close" | i18n }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          *ngIf="showRotateScreen"
-          (click)="cancelRotate()"
-        >
-          {{ "cancel" | i18n }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          *ngIf="clientSecret && !showRotateScreen"
-          (click)="rotateToken()"
-        >
-          {{ "rotateToken" | i18n }}
-        </button>
-      </div>
-    </form>
-  </div>
-</div>
+    </div>
+    <ng-container bitDialogFooter>
+      <button
+        type="submit"
+        bitButton
+        bitFormButton
+        buttonType="primary"
+        *ngIf="!clientSecret || showRotateScreen"
+      >
+        {{ submitButtonText }}
+      </button>
+      <button bitButton bitDialogClose type="button" *ngIf="!showRotateScreen">
+        {{ "close" | i18n }}
+      </button>
+      <button bitButton type="button" *ngIf="showRotateScreen" (click)="cancelRotate()">
+        {{ "cancel" | i18n }}
+      </button>
+      <button
+        bitButton
+        type="button"
+        *ngIf="clientSecret && !showRotateScreen"
+        (click)="rotateToken()"
+      >
+        {{ "rotateToken" | i18n }}
+      </button>
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
index 8386747170c..800f144b748 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
@@ -1,6 +1,7 @@
-import { Component } from "@angular/core";
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
 
-import { ModalConfig } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums";
@@ -8,8 +9,10 @@ import { OrganizationApiKeyRequest } from "@bitwarden/common/admin-console/model
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Verification } from "@bitwarden/common/types/verification";
+import { DialogService } from "@bitwarden/components";
 
 export interface BillingSyncApiModalData {
   organizationId: string;
@@ -17,63 +20,69 @@ export interface BillingSyncApiModalData {
 }
 
 @Component({
-  selector: "app-billing-sync-api-key",
   templateUrl: "billing-sync-api-key.component.html",
 })
 export class BillingSyncApiKeyComponent {
-  organizationId: string;
-  hasBillingToken: boolean;
+  protected organizationId: string;
+  protected hasBillingToken: boolean;
+
+  protected formGroup = new FormGroup({
+    verification: new FormControl<Verification>(null, Validators.required),
+  });
 
   showRotateScreen: boolean;
-  masterPassword: Verification;
-  formPromise: Promise<ApiKeyResponse>;
   clientSecret?: string;
   keyRevisionDate?: Date;
-  lastSyncDate?: Date = null;
+  lastSyncDate?: Date;
 
   constructor(
+    @Inject(DIALOG_DATA) protected data: BillingSyncApiModalData,
     private userVerificationService: UserVerificationService,
     private apiService: ApiService,
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
     private organizationApiService: OrganizationApiServiceAbstraction,
-    modalConfig: ModalConfig<BillingSyncApiModalData>
+    private logService: LogService
   ) {
-    this.organizationId = modalConfig.data.organizationId;
-    this.hasBillingToken = modalConfig.data.hasBillingToken;
+    this.organizationId = data.organizationId;
+    this.hasBillingToken = data.hasBillingToken;
   }
 
   copy() {
     this.platformUtilsService.copyToClipboard(this.clientSecret);
   }
 
-  async submit() {
-    if (this.showRotateScreen) {
-      this.formPromise = this.userVerificationService
-        .buildRequest(this.masterPassword, OrganizationApiKeyRequest)
+  submit = async () => {
+    try {
+      const request = this.userVerificationService
+        .buildRequest(this.formGroup.value.verification, OrganizationApiKeyRequest)
         .then((request) => {
           request.type = OrganizationApiKeyType.BillingSync;
+          return request;
+        });
+
+      if (this.showRotateScreen) {
+        const response = await request.then((request) => {
           return this.organizationApiService.rotateApiKey(this.organizationId, request);
         });
-      const response = await this.formPromise;
-      await this.load(response);
-      this.showRotateScreen = false;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("billingSyncApiKeyRotated")
-      );
-    } else {
-      this.formPromise = this.userVerificationService
-        .buildRequest(this.masterPassword, OrganizationApiKeyRequest)
-        .then((request) => {
-          request.type = OrganizationApiKeyType.BillingSync;
+        await this.load(response);
+        this.showRotateScreen = false;
+        this.platformUtilsService.showToast(
+          "success",
+          null,
+          this.i18nService.t("billingSyncApiKeyRotated")
+        );
+      } else {
+        const response = await request.then((request) => {
           return this.organizationApiService.getOrCreateApiKey(this.organizationId, request);
         });
-      const response = await this.formPromise;
-      await this.load(response);
+        await this.load(response);
+      }
+    } catch (e) {
+      this.logService.error(e);
+      throw e;
     }
-  }
+  };
 
   async load(response: ApiKeyResponse) {
     this.clientSecret = response.apiKey;
@@ -117,4 +126,8 @@ export class BillingSyncApiKeyComponent {
   get daysBetween(): number {
     return this.dayDiff(this.keyRevisionDate, new Date());
   }
+
+  static open(dialogService: DialogService, data: BillingSyncApiModalData) {
+    return dialogService.open(BillingSyncApiKeyComponent, { data });
+  }
 }
diff --git a/apps/web/src/app/billing/settings/billing-sync-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-key.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/billing-sync-key.component.html
rename to apps/web/src/app/billing/organizations/billing-sync-key.component.html
diff --git a/apps/web/src/app/billing/settings/billing-sync-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts
similarity index 98%
rename from apps/web/src/app/billing/settings/billing-sync-key.component.ts
rename to apps/web/src/app/billing/organizations/billing-sync-key.component.ts
index 3a855bb3ed8..58969551288 100644
--- a/apps/web/src/app/billing/settings/billing-sync-key.component.ts
+++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts
@@ -18,7 +18,6 @@ export interface BillingSyncKeyModalData {
 }
 
 @Component({
-  selector: "app-billing-sync-key",
   templateUrl: "billing-sync-key.component.html",
 })
 export class BillingSyncKeyComponent {
diff --git a/apps/web/src/app/billing/organizations/index.ts b/apps/web/src/app/billing/organizations/index.ts
new file mode 100644
index 00000000000..4b4461bf3c7
--- /dev/null
+++ b/apps/web/src/app/billing/organizations/index.ts
@@ -0,0 +1 @@
+export * from "./organization-plans.component";
diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
index 22cea10acbe..7f13f5e08f4 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
@@ -6,7 +6,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
 
 @Component({
-  selector: "app-org-billing-history-view",
   templateUrl: "organization-billing-history-view.component.html",
 })
 export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
index eae0fdfdecd..9b158eb610e 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
@@ -5,8 +5,8 @@ import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
-import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
 import { WebPlatformUtilsService } from "../../core/web-platform-utils.service";
+import { PaymentMethodComponent } from "../shared";
 
 import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
 import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
diff --git a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts
index b0946ae5604..90f5f6a4ddd 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts
@@ -6,7 +6,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 @Component({
-  selector: "app-org-billing-tab",
   templateUrl: "organization-billing-tab.component.html",
 })
 export class OrganizationBillingTabComponent implements OnInit {
diff --git a/apps/web/src/app/billing/organizations/organization-billing.module.ts b/apps/web/src/app/billing/organizations/organization-billing.module.ts
index bebf382a162..9fdc3165148 100644
--- a/apps/web/src/app/billing/organizations/organization-billing.module.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing.module.ts
@@ -1,37 +1,42 @@
 import { NgModule } from "@angular/core";
 
 import { UserVerificationModule } from "../../auth/shared/components/user-verification";
-import { LooseComponentsModule, SharedModule } from "../../shared";
+import { BillingSharedModule } from "../shared";
 
 import { AdjustSubscription } from "./adjust-subscription.component";
 import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
+import { BillingSyncKeyComponent } from "./billing-sync-key.component";
 import { ChangePlanComponent } from "./change-plan.component";
 import { DownloadLicenseComponent } from "./download-license.component";
 import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
 import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module";
 import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
+import { OrganizationPlansComponent } from "./organization-plans.component";
 import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
 import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component";
-import { SecretsManagerBillingModule } from "./secrets-manager/sm-billing.module";
+import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component";
+import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component";
 import { SubscriptionHiddenComponent } from "./subscription-hidden.component";
 
 @NgModule({
   imports: [
-    SharedModule,
-    LooseComponentsModule,
     OrganizationBillingRoutingModule,
     UserVerificationModule,
-    SecretsManagerBillingModule,
+    BillingSharedModule,
+    OrganizationPlansComponent,
   ],
   declarations: [
     AdjustSubscription,
     BillingSyncApiKeyComponent,
+    BillingSyncKeyComponent,
     ChangePlanComponent,
     DownloadLicenseComponent,
     OrganizationBillingTabComponent,
-    OrgBillingHistoryViewComponent,
-    OrganizationSubscriptionSelfhostComponent,
     OrganizationSubscriptionCloudComponent,
+    OrganizationSubscriptionSelfhostComponent,
+    OrgBillingHistoryViewComponent,
+    SecretsManagerAdjustSubscriptionComponent,
+    SecretsManagerSubscribeStandaloneComponent,
     SubscriptionHiddenComponent,
   ],
 })
diff --git a/apps/web/src/app/billing/settings/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
similarity index 99%
rename from apps/web/src/app/billing/settings/organization-plans.component.html
rename to apps/web/src/app/billing/organizations/organization-plans.component.html
index 06d04dc4e41..87a8ad61627 100644
--- a/apps/web/src/app/billing/settings/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -276,7 +276,7 @@
   <!-- Secrets Manager -->
   <div class="tw-my-10">
     <sm-subscribe
-      *ngIf="planOffersSecretsManager"
+      *ngIf="planOffersSecretsManager && !hasProvider"
       [formGroup]="formGroup.controls.secretsManager"
       [selectedPlan]="selectedSecretsManagerPlan"
       [upgradeOrganization]="!createOrganization"
diff --git a/apps/web/src/app/billing/settings/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
similarity index 97%
rename from apps/web/src/app/billing/settings/organization-plans.component.ts
rename to apps/web/src/app/billing/organizations/organization-plans.component.ts
index 3d898de2140..b85b5781461 100644
--- a/apps/web/src/app/billing/settings/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -35,10 +35,10 @@ import {
 } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
-import { secretsManagerSubscribeFormFactory } from "../organizations/secrets-manager/sm-subscribe.component";
-
-import { PaymentComponent } from "./payment.component";
-import { TaxInfoComponent } from "./tax-info.component";
+import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
+import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
+import { PaymentComponent } from "../shared/payment.component";
+import { TaxInfoComponent } from "../shared/tax-info.component";
 
 interface OnSuccessArgs {
   organizationId: string;
@@ -47,6 +47,8 @@ interface OnSuccessArgs {
 @Component({
   selector: "app-organization-plans",
   templateUrl: "organization-plans.component.html",
+  standalone: true,
+  imports: [BillingSharedModule, OrganizationCreateModule],
 })
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
@@ -146,7 +148,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       }
     }
 
-    if (this.providerId) {
+    if (this.hasProvider) {
       this.formGroup.controls.businessOwned.setValue(true);
       this.changedOwnedBusiness();
     }
@@ -174,7 +176,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   }
 
   get singleOrgPolicyBlock() {
-    return this.singleOrgPolicyAppliesToActiveUser && this.providerId == null;
+    return this.singleOrgPolicyAppliesToActiveUser && !this.hasProvider;
   }
 
   get createOrganization() {
@@ -233,6 +235,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     );
   }
 
+  get hasProvider() {
+    return this.providerId != null;
+  }
+
   additionalStoragePriceMonthly(selectedPlan: PlanResponse) {
     if (!selectedPlan.isAnnual) {
       return selectedPlan.additionalStoragePricePerGb;
@@ -538,7 +544,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     // Secrets Manager
     this.buildSecretsManagerRequest(request);
 
-    if (this.providerId) {
+    if (this.hasProvider) {
       const providerRequest = new ProviderOrganizationCreateRequest(
         this.formGroup.controls.clientOwnerEmail.value,
         request
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 04065fb3bd9..b2534e78c59 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -1,9 +1,8 @@
 import { DatePipe } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, Subject, takeUntil } from "rxjs";
+import { concatMap, firstValueFrom, Subject, takeUntil } from "rxjs";
 
-import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -18,14 +17,10 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService } from "@bitwarden/components";
 
-import {
-  BillingSyncApiKeyComponent,
-  BillingSyncApiModalData,
-} from "./billing-sync-api-key.component";
-import { SecretsManagerSubscriptionOptions } from "./secrets-manager/sm-adjust-subscription.component";
+import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
+import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
 
 @Component({
-  selector: "app-org-subscription-cloud",
   templateUrl: "organization-subscription-cloud.component.html",
 })
 export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy {
@@ -55,7 +50,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
     private logService: LogService,
-    private modalService: ModalService,
     private organizationService: OrganizationService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private route: ActivatedRoute,
@@ -116,6 +110,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
 
     this.showSecretsManagerSubscribe =
       this.userOrg.canEditSubscription &&
+      !this.userOrg.hasProvider &&
       !this.userOrg.useSecretsManager &&
       !this.subscription?.cancelled &&
       !this.subscriptionMarkedForCancel;
@@ -330,22 +325,13 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
   }
 
   async manageBillingSync() {
-    const modalConfig: ModalConfig<BillingSyncApiModalData> = {
-      data: {
-        organizationId: this.organizationId,
-        hasBillingToken: this.hasBillingSyncToken,
-      },
-    };
-    const modalRef = this.modalService.open(BillingSyncApiKeyComponent, modalConfig);
+    const dialogRef = BillingSyncApiKeyComponent.open(this.dialogService, {
+      organizationId: this.organizationId,
+      hasBillingToken: this.hasBillingSyncToken,
+    });
 
-    modalRef.onClosed
-      .pipe(
-        concatMap(async () => {
-          this.load();
-        }),
-        takeUntil(this.destroy$)
-      )
-      .subscribe();
+    await firstValueFrom(dialogRef.closed);
+    this.load();
   }
 
   closeDownloadLicense() {
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
index 06c474a6a11..69f0571f6cf 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
@@ -17,10 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import {
-  BillingSyncKeyComponent,
-  BillingSyncKeyModalData,
-} from "../../billing/settings/billing-sync-key.component";
+import { BillingSyncKeyComponent, BillingSyncKeyModalData } from "./billing-sync-key.component";
 
 enum LicenseOptions {
   SYNC = 0,
@@ -28,7 +25,6 @@ enum LicenseOptions {
 }
 
 @Component({
-  selector: "app-org-subscription-selfhost",
   templateUrl: "organization-subscription-selfhost.component.html",
 })
 export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/index.ts b/apps/web/src/app/billing/organizations/secrets-manager/index.ts
deleted file mode 100644
index fc0bcd35343..00000000000
--- a/apps/web/src/app/billing/organizations/secrets-manager/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./sm-billing.module";
-export * from "./sm-subscribe.component";
-export * from "./sm-subscribe-standalone.component";
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts b/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts
deleted file mode 100644
index 127a6e49fe6..00000000000
--- a/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { SharedModule } from "../../../shared";
-
-import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component";
-import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component";
-import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
-
-@NgModule({
-  imports: [SharedModule],
-  declarations: [
-    SecretsManagerSubscribeComponent,
-    SecretsManagerSubscribeStandaloneComponent,
-    SecretsManagerAdjustSubscriptionComponent,
-  ],
-  exports: [
-    SecretsManagerSubscribeComponent,
-    SecretsManagerSubscribeStandaloneComponent,
-    SecretsManagerAdjustSubscriptionComponent,
-  ],
-})
-export class SecretsManagerBillingModule {}
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.html b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html
similarity index 100%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.html
rename to apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
similarity index 100%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.ts
rename to apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.html b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.html
similarity index 100%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.html
rename to apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.html
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
similarity index 96%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts
rename to apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
index f4af8ed1d86..3ca365fb9b1 100644
--- a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts
+++ b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
@@ -10,7 +10,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { secretsManagerSubscribeFormFactory } from "./sm-subscribe.component";
+import { secretsManagerSubscribeFormFactory } from "../shared";
 
 @Component({
   selector: "sm-subscribe-standalone",
diff --git a/apps/web/src/app/billing/settings/add-credit.component.html b/apps/web/src/app/billing/shared/add-credit.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/add-credit.component.html
rename to apps/web/src/app/billing/shared/add-credit.component.html
diff --git a/apps/web/src/app/billing/settings/add-credit.component.ts b/apps/web/src/app/billing/shared/add-credit.component.ts
similarity index 100%
rename from apps/web/src/app/billing/settings/add-credit.component.ts
rename to apps/web/src/app/billing/shared/add-credit.component.ts
diff --git a/apps/web/src/app/billing/settings/adjust-payment.component.html b/apps/web/src/app/billing/shared/adjust-payment.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/adjust-payment.component.html
rename to apps/web/src/app/billing/shared/adjust-payment.component.html
diff --git a/apps/web/src/app/billing/settings/adjust-payment.component.ts b/apps/web/src/app/billing/shared/adjust-payment.component.ts
similarity index 100%
rename from apps/web/src/app/billing/settings/adjust-payment.component.ts
rename to apps/web/src/app/billing/shared/adjust-payment.component.ts
diff --git a/apps/web/src/app/settings/adjust-storage.component.html b/apps/web/src/app/billing/shared/adjust-storage.component.html
similarity index 100%
rename from apps/web/src/app/settings/adjust-storage.component.html
rename to apps/web/src/app/billing/shared/adjust-storage.component.html
diff --git a/apps/web/src/app/settings/adjust-storage.component.ts b/apps/web/src/app/billing/shared/adjust-storage.component.ts
similarity index 97%
rename from apps/web/src/app/settings/adjust-storage.component.ts
rename to apps/web/src/app/billing/shared/adjust-storage.component.ts
index df570d7f9a1..f4b55e603be 100644
--- a/apps/web/src/app/settings/adjust-storage.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-storage.component.ts
@@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { PaymentComponent } from "../billing/settings/payment.component";
+import { PaymentComponent } from "./payment.component";
 
 @Component({
   selector: "app-adjust-storage",
diff --git a/apps/web/src/app/billing/settings/billing-history.component.html b/apps/web/src/app/billing/shared/billing-history.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/billing-history.component.html
rename to apps/web/src/app/billing/shared/billing-history.component.html
diff --git a/apps/web/src/app/billing/settings/billing-history.component.ts b/apps/web/src/app/billing/shared/billing-history.component.ts
similarity index 100%
rename from apps/web/src/app/billing/settings/billing-history.component.ts
rename to apps/web/src/app/billing/shared/billing-history.component.ts
diff --git a/apps/web/src/app/billing/shared/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts
new file mode 100644
index 00000000000..1b8f083a876
--- /dev/null
+++ b/apps/web/src/app/billing/shared/billing-shared.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from "@angular/core";
+
+import { SharedModule } from "../../shared";
+
+import { AddCreditComponent } from "./add-credit.component";
+import { AdjustPaymentComponent } from "./adjust-payment.component";
+import { AdjustStorageComponent } from "./adjust-storage.component";
+import { BillingHistoryComponent } from "./billing-history.component";
+import { PaymentMethodComponent } from "./payment-method.component";
+import { PaymentComponent } from "./payment.component";
+import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
+import { TaxInfoComponent } from "./tax-info.component";
+import { UpdateLicenseComponent } from "./update-license.component";
+
+@NgModule({
+  imports: [SharedModule, PaymentComponent, TaxInfoComponent],
+  declarations: [
+    AddCreditComponent,
+    AdjustPaymentComponent,
+    AdjustStorageComponent,
+    BillingHistoryComponent,
+    PaymentMethodComponent,
+    SecretsManagerSubscribeComponent,
+    UpdateLicenseComponent,
+  ],
+  exports: [
+    SharedModule,
+    PaymentComponent,
+    TaxInfoComponent,
+
+    AdjustStorageComponent,
+    BillingHistoryComponent,
+    SecretsManagerSubscribeComponent,
+    UpdateLicenseComponent,
+  ],
+})
+export class BillingSharedModule {}
diff --git a/apps/web/src/app/billing/shared/index.ts b/apps/web/src/app/billing/shared/index.ts
new file mode 100644
index 00000000000..ae28e45f789
--- /dev/null
+++ b/apps/web/src/app/billing/shared/index.ts
@@ -0,0 +1,5 @@
+export * from "./billing-shared.module";
+export * from "./payment-method.component";
+export * from "./payment.component";
+export * from "./sm-subscribe.component";
+export * from "./tax-info.component";
diff --git a/apps/web/src/app/billing/settings/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/payment-method.component.html
rename to apps/web/src/app/billing/shared/payment-method.component.html
diff --git a/apps/web/src/app/billing/settings/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
similarity index 99%
rename from apps/web/src/app/billing/settings/payment-method.component.ts
rename to apps/web/src/app/billing/shared/payment-method.component.ts
index 5a8e598f7b8..a99202f9910 100644
--- a/apps/web/src/app/billing/settings/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -17,7 +17,6 @@ import { DialogService } from "@bitwarden/components";
 import { TaxInfoComponent } from "./tax-info.component";
 
 @Component({
-  selector: "app-payment-method",
   templateUrl: "payment-method.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
diff --git a/apps/web/src/app/billing/settings/payment.component.html b/apps/web/src/app/billing/shared/payment.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/payment.component.html
rename to apps/web/src/app/billing/shared/payment.component.html
diff --git a/apps/web/src/app/billing/settings/payment.component.ts b/apps/web/src/app/billing/shared/payment.component.ts
similarity index 99%
rename from apps/web/src/app/billing/settings/payment.component.ts
rename to apps/web/src/app/billing/shared/payment.component.ts
index e5c9c3dd3c5..68cc93c270b 100644
--- a/apps/web/src/app/billing/settings/payment.component.ts
+++ b/apps/web/src/app/billing/shared/payment.component.ts
@@ -6,9 +6,13 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+import { SharedModule } from "../../shared";
+
 @Component({
   selector: "app-payment",
   templateUrl: "payment.component.html",
+  standalone: true,
+  imports: [SharedModule],
 })
 export class PaymentComponent implements OnInit, OnDestroy {
   @Input() showMethods = true;
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.html b/apps/web/src/app/billing/shared/sm-subscribe.component.html
similarity index 97%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.html
rename to apps/web/src/app/billing/shared/sm-subscribe.component.html
index c50d77be043..62a80c2a999 100644
--- a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.html
+++ b/apps/web/src/app/billing/shared/sm-subscribe.component.html
@@ -40,7 +40,7 @@
 
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="enabled" />
-      <bit-label>{{ "addSecretsManager" | i18n }}</bit-label>
+      <bit-label>{{ "subscribeToSecretsManager" | i18n }}</bit-label>
       <bit-hint *ngIf="upgradeOrganization">{{ "addSecretsManagerUpgradeDesc" | i18n }}</bit-hint>
     </bit-form-control>
 
diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
similarity index 97%
rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts
rename to apps/web/src/app/billing/shared/sm-subscribe.component.ts
index 2d56d033a19..b48809813b1 100644
--- a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts
+++ b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
@@ -7,7 +7,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
 import { ProductType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { SecretsManagerLogo } from "../../../layouts/secrets-manager-logo";
+import { SecretsManagerLogo } from "../../layouts/secrets-manager-logo";
 
 export interface SecretsManagerSubscription {
   enabled: boolean;
diff --git a/apps/web/src/app/billing/settings/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html
similarity index 100%
rename from apps/web/src/app/billing/settings/tax-info.component.html
rename to apps/web/src/app/billing/shared/tax-info.component.html
diff --git a/apps/web/src/app/billing/settings/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
similarity index 98%
rename from apps/web/src/app/billing/settings/tax-info.component.ts
rename to apps/web/src/app/billing/shared/tax-info.component.ts
index a7ceea0b2d3..27584bfd778 100644
--- a/apps/web/src/app/billing/settings/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -9,6 +9,8 @@ import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-i
 import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+import { SharedModule } from "../../shared";
+
 type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
   includeTaxId: boolean;
   [key: string]: unknown;
@@ -17,6 +19,8 @@ type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
+  standalone: true,
+  imports: [SharedModule],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TaxInfoComponent {
diff --git a/apps/web/src/app/settings/update-license.component.html b/apps/web/src/app/billing/shared/update-license.component.html
similarity index 100%
rename from apps/web/src/app/settings/update-license.component.html
rename to apps/web/src/app/billing/shared/update-license.component.html
diff --git a/apps/web/src/app/settings/update-license.component.ts b/apps/web/src/app/billing/shared/update-license.component.ts
similarity index 100%
rename from apps/web/src/app/settings/update-license.component.ts
rename to apps/web/src/app/billing/shared/update-license.component.ts
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index b2e44d7e3db..4df6557fac5 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -21,13 +21,11 @@ import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/p
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 
 import { PolicyListService } from "../admin-console/core/policy-list.service";
 import { HtmlStorageService } from "../core/html-storage.service";
 import { I18nService } from "../core/i18n.service";
 import { CollectionAdminService } from "../vault/core/collection-admin.service";
-import { PasswordRepromptService } from "../vault/core/password-reprompt.service";
 
 import { BroadcasterMessagingService } from "./broadcaster-messaging.service";
 import { EventService } from "./event.service";
@@ -87,10 +85,6 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
       provide: BaseStateServiceAbstraction,
       useExisting: StateService,
     },
-    {
-      provide: PasswordRepromptServiceAbstraction,
-      useClass: PasswordRepromptService,
-    },
     {
       provide: FileDownloadService,
       useClass: WebFileDownloadService,
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
index e0705dd070b..7a637c642b4 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
@@ -47,9 +47,10 @@ export class ProductSwitcherContentComponent {
     map(([orgs, paramMap]) => {
       const routeOrg = orgs.find((o) => o.id === paramMap.get("organizationId"));
       // If the active route org doesn't have access to SM, find the first org that does.
-      const smOrg = routeOrg?.canAccessSecretsManager
-        ? routeOrg
-        : orgs.find((o) => o.canAccessSecretsManager);
+      const smOrg =
+        routeOrg?.canAccessSecretsManager && routeOrg?.enabled == true
+          ? routeOrg
+          : orgs.find((o) => o.canAccessSecretsManager && o.enabled == true);
 
       /**
        * We can update this to the "satisfies" type upon upgrading to TypeScript 4.9
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
index 87e42027476..46a2df458b0 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
@@ -131,5 +131,5 @@ OrgWithoutSecretsManager.args = {
 
 export const OrgWithSecretsManager = Template.bind({});
 OrgWithSecretsManager.args = {
-  mockOrgs: [{ id: "b", canAccessSecretsManager: true }],
+  mockOrgs: [{ id: "b", canAccessSecretsManager: true, enabled: true }],
 };
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 6ec42dc5be2..53556de1ec8 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -11,7 +11,6 @@ import {
 import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
-import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module";
 import { flagEnabled, Flags } from "../utils/flags";
 
 import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
@@ -223,7 +222,10 @@ const routes: Routes = [
           },
           {
             path: "subscription",
-            loadChildren: () => SubscriptionRoutingModule,
+            loadChildren: () =>
+              import("./billing/individual/individual-billing.module").then(
+                (m) => m.IndividualBillingModule
+              ),
           },
           {
             path: "emergency-access",
@@ -254,11 +256,13 @@ const routes: Routes = [
         children: [
           { path: "", pathMatch: "full", redirectTo: "generator" },
           {
-            path: "",
+            path: "import",
+            loadChildren: () => import("./tools/import/import.module").then((m) => m.ImportModule),
+          },
+          {
+            path: "export",
             loadChildren: () =>
-              import("./tools/import-export/import-export.module").then(
-                (m) => m.ImportExportModule
-              ),
+              import("./tools/vault-export/export.module").then((m) => m.ExportModule),
           },
           {
             path: "generator",
diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts
index 16b4feee811..a68b681dca3 100644
--- a/apps/web/src/app/oss.module.ts
+++ b/apps/web/src/app/oss.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from "@angular/core";
 
-import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module";
 import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module";
 import { AuthModule } from "./auth";
 import { LoginModule } from "./auth/login/login.module";
@@ -17,7 +16,6 @@ import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-f
     VaultFilterModule,
     OrganizationBadgeModule,
     OrganizationUserModule,
-    OrganizationCreateModule,
     LoginModule,
     AuthModule,
   ],
diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts
index c6af91fb962..80c41b0c252 100644
--- a/apps/web/src/app/reports/pages/cipher-report.component.ts
+++ b/apps/web/src/app/reports/pages/cipher-report.component.ts
@@ -3,9 +3,9 @@ import { Directive, ViewChild, ViewContainerRef } from "@angular/core";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AddEditComponent } from "../../vault/individual-vault/add-edit.component";
 import { AddEditComponent as OrgAddEditComponent } from "../../vault/org-vault/add-edit.component";
diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
index 38b18dae160..dec2f707d4a 100644
--- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
@@ -4,9 +4,9 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
index a70ede0102e..ad257d7e596 100644
--- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
@@ -5,9 +5,9 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
index 95851eca1b7..431b571fa16 100644
--- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
@@ -4,9 +4,9 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
index 14bc961e347..42ddb3b1d5d 100644
--- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
@@ -3,9 +3,9 @@ import { Component, OnInit } from "@angular/core";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
index ddea66a6a91..b5bad708afd 100644
--- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
@@ -4,10 +4,10 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { BadgeTypes } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 6ad84b20b8c..39c8e98cb1e 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -3,12 +3,10 @@ import { NgModule } from "@angular/core";
 import { PasswordCalloutComponent } from "@bitwarden/auth";
 
 import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component";
-import { OrganizationCreateModule } from "../admin-console/organizations/create/organization-create.module";
 import { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component";
 import { EventsComponent as OrgEventsComponent } from "../admin-console/organizations/manage/events.component";
 import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
 import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component";
-import { FamiliesForEnterpriseSetupComponent } from "../admin-console/organizations/sponsorships/families-for-enterprise-setup.component";
 import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../admin-console/organizations/tools/exposed-passwords-report.component";
 import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../admin-console/organizations/tools/inactive-two-factor-report.component";
 import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../admin-console/organizations/tools/reused-passwords-report.component";
@@ -16,7 +14,6 @@ import { ToolsComponent as OrgToolsComponent } from "../admin-console/organizati
 import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../admin-console/organizations/tools/unsecured-websites-report.component";
 import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component";
 import { ProvidersComponent } from "../admin-console/providers/providers.component";
-import { CreateOrganizationComponent } from "../admin-console/settings/create-organization.component";
 import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component";
 import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component";
 import { AuthModule } from "../auth";
@@ -53,19 +50,6 @@ import { UpdatePasswordComponent } from "../auth/update-password.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
-import { SecretsManagerBillingModule } from "../billing/organizations/secrets-manager/sm-billing.module";
-import { AddCreditComponent } from "../billing/settings/add-credit.component";
-import { AdjustPaymentComponent } from "../billing/settings/adjust-payment.component";
-import { BillingHistoryViewComponent } from "../billing/settings/billing-history-view.component";
-import { BillingHistoryComponent } from "../billing/settings/billing-history.component";
-import { BillingSyncKeyComponent } from "../billing/settings/billing-sync-key.component";
-import { OrganizationPlansComponent } from "../billing/settings/organization-plans.component";
-import { PaymentMethodComponent } from "../billing/settings/payment-method.component";
-import { PaymentComponent } from "../billing/settings/payment.component";
-import { PremiumComponent } from "../billing/settings/premium.component";
-import { SubscriptionComponent } from "../billing/settings/subscription.component";
-import { TaxInfoComponent } from "../billing/settings/tax-info.component";
-import { UserSubscriptionComponent } from "../billing/settings/user-subscription.component";
 import { DynamicAvatarComponent } from "../components/dynamic-avatar.component";
 import { SelectableAvatarComponent } from "../components/selectable-avatar.component";
 import { FooterComponent } from "../layouts/footer.component";
@@ -74,7 +58,6 @@ import { NavbarComponent } from "../layouts/navbar.component";
 import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module";
 import { UserLayoutComponent } from "../layouts/user-layout.component";
 import { AccountComponent } from "../settings/account.component";
-import { AdjustStorageComponent } from "../settings/adjust-storage.component";
 import { ApiKeyComponent } from "../settings/api-key.component";
 import { ChangeAvatarComponent } from "../settings/change-avatar.component";
 import { ChangeEmailComponent } from "../settings/change-email.component";
@@ -88,14 +71,12 @@ import { PurgeVaultComponent } from "../settings/purge-vault.component";
 import { SecurityKeysComponent } from "../settings/security-keys.component";
 import { SecurityComponent } from "../settings/security.component";
 import { SettingsComponent } from "../settings/settings.component";
-import { UpdateLicenseComponent } from "../settings/update-license.component";
 import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
 import { GeneratorComponent } from "../tools/generator.component";
 import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
 import { AccessComponent } from "../tools/send/access.component";
 import { AddEditComponent as SendAddEditComponent } from "../tools/send/add-edit.component";
 import { ToolsComponent } from "../tools/tools.component";
-import { PasswordRepromptComponent } from "../vault/components/password-reprompt.component";
 import { PremiumBadgeComponent } from "../vault/components/premium-badge.component";
 import { AddEditCustomFieldsComponent } from "../vault/individual-vault/add-edit-custom-fields.component";
 import { AddEditComponent } from "../vault/individual-vault/add-edit.component";
@@ -116,7 +97,6 @@ import { SharedModule } from "./shared.module";
 @NgModule({
   imports: [
     SharedModule,
-    OrganizationCreateModule,
     RegisterFormModule,
     ProductSwitcherModule,
     UserVerificationModule,
@@ -128,9 +108,6 @@ import { SharedModule } from "./shared.module";
     AuthModule,
     EnvironmentSelectorModule,
     AccountFingerprintComponent,
-
-    // To be removed when OrganizationPlansComponent is moved to its own module (see AC-1453)
-    SecretsManagerBillingModule,
     PasswordCalloutComponent,
   ],
   declarations: [
@@ -138,18 +115,13 @@ import { SharedModule } from "./shared.module";
     AcceptOrganizationComponent,
     AccessComponent,
     AccountComponent,
-    AddCreditComponent,
     AddEditComponent,
     AddEditCustomFieldsComponent,
     AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
     ApiKeyComponent,
     AttachmentsComponent,
-    BillingSyncKeyComponent,
     ChangeEmailComponent,
     CollectionsComponent,
-    CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
     DeleteAccountComponent,
     DomainRulesComponent,
@@ -160,7 +132,6 @@ import { SharedModule } from "./shared.module";
     EmergencyAccessTakeoverComponent,
     EmergencyAccessViewComponent,
     EmergencyAddEditComponent,
-    FamiliesForEnterpriseSetupComponent,
     FolderAddEditComponent,
     FooterComponent,
     FrontendLayoutComponent,
@@ -170,7 +141,6 @@ import { SharedModule } from "./shared.module";
     OrganizationSwitcherComponent,
     OrgAddEditComponent,
     OrganizationLayoutComponent,
-    OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgCollectionsComponent,
     OrgEventsComponent,
@@ -183,12 +153,8 @@ import { SharedModule } from "./shared.module";
     OrgWeakPasswordsReportComponent,
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
-    PasswordRepromptComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
     PreferencesComponent,
     PremiumBadgeComponent,
-    PremiumComponent,
     ProfileComponent,
     ChangeAvatarComponent,
     ProvidersComponent,
@@ -206,8 +172,6 @@ import { SharedModule } from "./shared.module";
     SponsoredFamiliesComponent,
     SponsoringOrgRowComponent,
     SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticatorComponent,
     TwoFactorComponent,
@@ -219,13 +183,9 @@ import { SharedModule } from "./shared.module";
     TwoFactorVerifyComponent,
     TwoFactorWebAuthnComponent,
     TwoFactorYubiKeyComponent,
-    UpdateLicenseComponent,
     UpdatePasswordComponent,
     UpdateTempPasswordComponent,
-    BillingHistoryComponent,
-    BillingHistoryViewComponent,
     UserLayoutComponent,
-    UserSubscriptionComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
@@ -238,17 +198,13 @@ import { SharedModule } from "./shared.module";
     AcceptOrganizationComponent,
     AccessComponent,
     AccountComponent,
-    AddCreditComponent,
     AddEditComponent,
     AddEditCustomFieldsComponent,
     AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
     ApiKeyComponent,
     AttachmentsComponent,
     ChangeEmailComponent,
     CollectionsComponent,
-    CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
     DeleteAccountComponent,
     DomainRulesComponent,
@@ -260,7 +216,6 @@ import { SharedModule } from "./shared.module";
     EmergencyAccessTakeoverComponent,
     EmergencyAccessViewComponent,
     EmergencyAddEditComponent,
-    FamiliesForEnterpriseSetupComponent,
     FolderAddEditComponent,
     FooterComponent,
     FrontendLayoutComponent,
@@ -270,7 +225,6 @@ import { SharedModule } from "./shared.module";
     OrganizationSwitcherComponent,
     OrgAddEditComponent,
     OrganizationLayoutComponent,
-    OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgCollectionsComponent,
     OrgEventsComponent,
@@ -283,12 +237,8 @@ import { SharedModule } from "./shared.module";
     OrgWeakPasswordsReportComponent,
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
-    PasswordRepromptComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
     PreferencesComponent,
     PremiumBadgeComponent,
-    PremiumComponent,
     ProfileComponent,
     ChangeAvatarComponent,
     ProvidersComponent,
@@ -306,8 +256,6 @@ import { SharedModule } from "./shared.module";
     SponsoredFamiliesComponent,
     SponsoringOrgRowComponent,
     SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticatorComponent,
     TwoFactorComponent,
@@ -319,13 +267,9 @@ import { SharedModule } from "./shared.module";
     TwoFactorVerifyComponent,
     TwoFactorWebAuthnComponent,
     TwoFactorYubiKeyComponent,
-    UpdateLicenseComponent,
     UpdatePasswordComponent,
     UpdateTempPasswordComponent,
-    BillingHistoryComponent,
-    BillingHistoryViewComponent,
     UserLayoutComponent,
-    UserSubscriptionComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
diff --git a/apps/web/src/app/tools/import-export/dialog/file-password-prompt.component.html b/apps/web/src/app/tools/import/dialog/file-password-prompt.component.html
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/file-password-prompt.component.html
rename to apps/web/src/app/tools/import/dialog/file-password-prompt.component.html
diff --git a/apps/web/src/app/tools/import-export/dialog/file-password-prompt.component.ts b/apps/web/src/app/tools/import/dialog/file-password-prompt.component.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/file-password-prompt.component.ts
rename to apps/web/src/app/tools/import/dialog/file-password-prompt.component.ts
diff --git a/apps/web/src/app/tools/import-export/dialog/import-error-dialog.component.html b/apps/web/src/app/tools/import/dialog/import-error-dialog.component.html
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/import-error-dialog.component.html
rename to apps/web/src/app/tools/import/dialog/import-error-dialog.component.html
diff --git a/apps/web/src/app/tools/import-export/dialog/import-error-dialog.component.ts b/apps/web/src/app/tools/import/dialog/import-error-dialog.component.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/import-error-dialog.component.ts
rename to apps/web/src/app/tools/import/dialog/import-error-dialog.component.ts
diff --git a/apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.html b/apps/web/src/app/tools/import/dialog/import-success-dialog.component.html
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.html
rename to apps/web/src/app/tools/import/dialog/import-success-dialog.component.html
diff --git a/apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.ts b/apps/web/src/app/tools/import/dialog/import-success-dialog.component.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.ts
rename to apps/web/src/app/tools/import/dialog/import-success-dialog.component.ts
diff --git a/apps/web/src/app/tools/import-export/dialog/index.ts b/apps/web/src/app/tools/import/dialog/index.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/dialog/index.ts
rename to apps/web/src/app/tools/import/dialog/index.ts
diff --git a/apps/web/src/app/tools/import/import-routing.module.ts b/apps/web/src/app/tools/import/import-routing.module.ts
new file mode 100644
index 00000000000..82d0a733846
--- /dev/null
+++ b/apps/web/src/app/tools/import/import-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+
+import { ImportComponent } from "./import.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: ImportComponent,
+    data: { titleId: "importData" },
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+})
+export class ImportRoutingModule {}
diff --git a/apps/web/src/app/tools/import-export/import.component.html b/apps/web/src/app/tools/import/import.component.html
similarity index 100%
rename from apps/web/src/app/tools/import-export/import.component.html
rename to apps/web/src/app/tools/import/import.component.html
diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import/import.component.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/import.component.ts
rename to apps/web/src/app/tools/import/import.component.ts
diff --git a/apps/web/src/app/tools/import-export/import-export.module.ts b/apps/web/src/app/tools/import/import.module.ts
similarity index 85%
rename from apps/web/src/app/tools/import-export/import-export.module.ts
rename to apps/web/src/app/tools/import/import.module.ts
index d180417cdcc..34f71cfab7f 100644
--- a/apps/web/src/app/tools/import-export/import-export.module.ts
+++ b/apps/web/src/app/tools/import/import.module.ts
@@ -20,15 +20,13 @@ import {
   ImportSuccessDialogComponent,
   FilePasswordPromptComponent,
 } from "./dialog";
-import { ExportComponent } from "./export.component";
-import { ImportExportRoutingModule } from "./import-export-routing.module";
+import { ImportRoutingModule } from "./import-routing.module";
 import { ImportComponent } from "./import.component";
 
 @NgModule({
-  imports: [SharedModule, LooseComponentsModule, ImportExportRoutingModule],
+  imports: [SharedModule, LooseComponentsModule, ImportRoutingModule],
   declarations: [
     ImportComponent,
-    ExportComponent,
     FilePasswordPromptComponent,
     ImportErrorDialogComponent,
     ImportSuccessDialogComponent,
@@ -53,4 +51,4 @@ import { ImportComponent } from "./import.component";
     },
   ],
 })
-export class ImportExportModule {}
+export class ImportModule {}
diff --git a/apps/web/src/app/tools/import-export/import-export-routing.module.ts b/apps/web/src/app/tools/vault-export/export-routing.module.ts
similarity index 60%
rename from apps/web/src/app/tools/import-export/import-export-routing.module.ts
rename to apps/web/src/app/tools/vault-export/export-routing.module.ts
index 101e149d7f8..3afda4a06f2 100644
--- a/apps/web/src/app/tools/import-export/import-export-routing.module.ts
+++ b/apps/web/src/app/tools/vault-export/export-routing.module.ts
@@ -2,16 +2,10 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { ExportComponent } from "./export.component";
-import { ImportComponent } from "./import.component";
 
 const routes: Routes = [
   {
-    path: "import",
-    component: ImportComponent,
-    data: { titleId: "importData" },
-  },
-  {
-    path: "export",
+    path: "",
     component: ExportComponent,
     data: { titleId: "exportVault" },
   },
@@ -20,4 +14,4 @@ const routes: Routes = [
 @NgModule({
   imports: [RouterModule.forChild(routes)],
 })
-export class ImportExportRoutingModule {}
+export class ExportRoutingModule {}
diff --git a/apps/web/src/app/tools/import-export/export.component.html b/apps/web/src/app/tools/vault-export/export.component.html
similarity index 100%
rename from apps/web/src/app/tools/import-export/export.component.html
rename to apps/web/src/app/tools/vault-export/export.component.html
diff --git a/apps/web/src/app/tools/import-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts
similarity index 100%
rename from apps/web/src/app/tools/import-export/export.component.ts
rename to apps/web/src/app/tools/vault-export/export.component.ts
diff --git a/apps/web/src/app/tools/vault-export/export.module.ts b/apps/web/src/app/tools/vault-export/export.module.ts
new file mode 100644
index 00000000000..aca8bdbd4ec
--- /dev/null
+++ b/apps/web/src/app/tools/vault-export/export.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from "@angular/core";
+
+import { LooseComponentsModule, SharedModule } from "../../shared";
+
+import { ExportRoutingModule } from "./export-routing.module";
+import { ExportComponent } from "./export.component";
+
+@NgModule({
+  imports: [SharedModule, LooseComponentsModule, ExportRoutingModule],
+  declarations: [ExportComponent],
+})
+export class ExportModule {}
diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
index 34829f58b6b..0e14d88ef8f 100644
--- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
+++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
@@ -51,7 +51,7 @@ export interface CollectionDialogParams {
 
 export interface CollectionDialogResult {
   action: CollectionDialogAction;
-  collection: CollectionResponse;
+  collection: CollectionResponse | CollectionView;
 }
 
 export enum CollectionDialogAction {
@@ -263,7 +263,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
       this.i18nService.t("deletedCollectionId", this.collection?.name)
     );
 
-    this.close(CollectionDialogAction.Deleted);
+    this.close(CollectionDialogAction.Deleted, this.collection);
   };
 
   ngOnDestroy(): void {
@@ -271,7 +271,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     this.destroy$.complete();
   }
 
-  private close(action: CollectionDialogAction, collection?: CollectionResponse) {
+  private close(action: CollectionDialogAction, collection?: CollectionResponse | CollectionView) {
     this.dialogRef.close({ action, collection } as CollectionDialogResult);
   }
 }
diff --git a/apps/web/src/app/vault/components/password-reprompt.component.html b/apps/web/src/app/vault/components/password-reprompt.component.html
deleted file mode 100644
index ebd81976566..00000000000
--- a/apps/web/src/app/vault/components/password-reprompt.component.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="confirmUserTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()">
-      <div class="modal-header">
-        <h1 class="modal-title" id="confirmUserTitle">
-          {{ "passwordConfirmation" | i18n }}
-        </h1>
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        {{ "passwordConfirmationDesc" | i18n }}
-
-        <div class="form-group">
-          <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-          <div class="d-flex">
-            <input
-              id="masterPassword"
-              type="{{ showPassword ? 'text' : 'password' }}"
-              name="MasterPassword"
-              class="text-monospace form-control"
-              [(ngModel)]="masterPassword"
-              required
-              appAutofocus
-              appInputVerbatim
-            />
-            <button
-              type="button"
-              class="ml-1 btn btn-link"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-              (click)="togglePassword()"
-            >
-              <i
-                class="bwi bwi-lg"
-                aria-hidden="true"
-                [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-              ></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit">
-          <span>{{ "ok" | i18n }}</span>
-        </button>
-        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
-          {{ "cancel" | i18n }}
-        </button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/web/src/app/vault/components/password-reprompt.component.ts b/apps/web/src/app/vault/components/password-reprompt.component.ts
deleted file mode 100644
index f63da5ed48e..00000000000
--- a/apps/web/src/app/vault/components/password-reprompt.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component";
-
-@Component({
-  templateUrl: "password-reprompt.component.html",
-})
-export class PasswordRepromptComponent extends BasePasswordRepromptComponent {}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 07d061311cf..934062fa699 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -22,6 +22,7 @@
       queryParamsHandling="merge"
       title="{{ 'editItemWithName' | i18n : cipher.name }}"
       type="button"
+      appStopProp
     >
       {{ cipher.name }}
     </button>
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 7bd9677c759..7c70a797437 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -55,7 +55,7 @@ export class VaultCipherRowComponent {
   @HostListener("click")
   protected click() {
     this.router.navigate([], {
-      queryParams: { cipherId: this.cipher.id },
+      queryParams: { itemId: this.cipher.id },
       queryParamsHandling: "merge",
     });
   }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
index faee4e030b9..cd5af43ae3d 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
@@ -60,11 +60,11 @@ export class VaultCollectionRowComponent {
   }
 
   protected edit() {
-    this.onEvent.next({ type: "edit", item: this.collection });
+    this.onEvent.next({ type: "editCollection", item: this.collection });
   }
 
   protected access() {
-    this.onEvent.next({ type: "viewAccess", item: this.collection });
+    this.onEvent.next({ type: "viewCollectionAccess", item: this.collection });
   }
 
   protected deleteCollection() {
diff --git a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
index cacd13829fb..a72734d93da 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
@@ -6,9 +6,9 @@ import { VaultItem } from "./vault-item";
 export type VaultItemEvent =
   | { type: "viewAttachments"; item: CipherView }
   | { type: "viewCollections"; item: CipherView }
-  | { type: "viewAccess"; item: CollectionView }
+  | { type: "viewCollectionAccess"; item: CollectionView }
   | { type: "viewEvents"; item: CipherView }
-  | { type: "edit"; item: CollectionView }
+  | { type: "editCollection"; item: CollectionView }
   | { type: "clone"; item: CipherView }
   | { type: "restore"; items: CipherView[] }
   | { type: "delete"; items: VaultItem[] }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index a9be8dbf1e0..05ac26964f3 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -30,12 +30,12 @@
             appA11yTitle="{{ 'options' | i18n }}"
           ></button>
           <bit-menu #headerMenu>
-            <button *ngIf="showBulkMove" type="button" bitMenuItem (click)="bulkMoveToFolder()">
+            <button *ngIf="bulkMoveAllowed" type="button" bitMenuItem (click)="bulkMoveToFolder()">
               <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
               {{ "moveSelected" | i18n }}
             </button>
             <button
-              *ngIf="showBulkMove"
+              *ngIf="bulkMoveAllowed"
               type="button"
               bitMenuItem
               (click)="bulkMoveToOrganization()"
@@ -58,7 +58,7 @@
       </tr>
     </ng-container>
     <ng-template body let-rows$>
-      <ng-container *cdkVirtualFor="let item of rows$">
+      <ng-container *cdkVirtualFor="let item of rows$; templateCacheSize: 0">
         <tr
           *ngIf="item.collection"
           bitRow
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 8c9ad1ac065..19af9087f08 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -7,7 +7,6 @@ import { CollectionView } from "@bitwarden/common/vault/models/view/collection.v
 import { TableDataSource } from "@bitwarden/components";
 
 import { GroupView } from "../../../admin-console/organizations/core";
-import { CollectionAdminView } from "../../core/views/collection-admin.view";
 import { Unassigned } from "../../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 
 import { VaultItem } from "./vault-item";
@@ -33,7 +32,6 @@ export class VaultItemsComponent {
   @Input() showCollections: boolean;
   @Input() showGroups: boolean;
   @Input() useEvents: boolean;
-  @Input() editableCollections: boolean;
   @Input() cloneableOrganizationCiphers: boolean;
   @Input() showPremiumFeatures: boolean;
   @Input() showBulkMove: boolean;
@@ -80,44 +78,30 @@ export class VaultItemsComponent {
     return this.dataSource.data.length === 0;
   }
 
-  protected canEditCollection(collection: CollectionView): boolean {
-    // We currently don't support editing collections from individual vault
-    if (!(collection instanceof CollectionAdminView)) {
-      return false;
-    }
-
-    // Only allow allow deletion if collection editing is enabled and not deleting "Unassigned"
-    if (!this.editableCollections || collection.id === Unassigned) {
-      return false;
-    }
-
-    const organization = this.allOrganizations.find((o) => o.id === collection.organizationId);
-
-    // Otherwise, check if we can edit the specified collection
+  get bulkMoveAllowed() {
     return (
-      organization?.canEditAnyCollection ||
-      (organization?.canEditAssignedCollections && collection.assigned)
+      this.showBulkMove && this.selection.selected.filter((item) => item.collection).length === 0
     );
   }
 
-  protected canDeleteCollection(collection: CollectionView): boolean {
-    // We currently don't support editing collections from individual vault
-    if (!(collection instanceof CollectionAdminView)) {
-      return false;
-    }
-
+  protected canEditCollection(collection: CollectionView): boolean {
     // Only allow allow deletion if collection editing is enabled and not deleting "Unassigned"
-    if (!this.editableCollections || collection.id === Unassigned) {
+    if (collection.id === Unassigned) {
       return false;
     }
 
     const organization = this.allOrganizations.find((o) => o.id === collection.organizationId);
+    return collection.canEdit(organization);
+  }
 
-    // Otherwise, check if we can delete the specified collection
-    return (
-      organization?.canDeleteAnyCollection ||
-      (organization?.canDeleteAssignedCollections && collection.assigned)
-    );
+  protected canDeleteCollection(collection: CollectionView): boolean {
+    // Only allow allow deletion if collection editing is enabled and not deleting "Unassigned"
+    if (collection.id === Unassigned) {
+      return false;
+    }
+
+    const organization = this.allOrganizations.find((o) => o.id === collection.organizationId);
+    return collection.canDelete(organization);
   }
 
   protected toggleAll() {
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
index e6736348430..60b5612d223 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
@@ -125,7 +125,6 @@ Individual.args = {
   showBulkMove: true,
   showBulkTrashOptions: false,
   useEvents: false,
-  editableCollections: false,
   cloneableOrganizationCiphers: false,
 };
 
@@ -141,7 +140,6 @@ IndividualDisabled.args = {
   showBulkMove: true,
   showBulkTrashOptions: false,
   useEvents: false,
-  editableCollections: false,
   cloneableOrganizationCiphers: false,
 };
 
@@ -156,7 +154,6 @@ IndividualTrash.args = {
   showBulkMove: false,
   showBulkTrashOptions: true,
   useEvents: false,
-  editableCollections: false,
   cloneableOrganizationCiphers: false,
 };
 
@@ -171,7 +168,6 @@ IndividualTopLevelCollection.args = {
   showBulkMove: false,
   showBulkTrashOptions: false,
   useEvents: false,
-  editableCollections: false,
   cloneableOrganizationCiphers: false,
 };
 
@@ -186,7 +182,6 @@ IndividualSecondLevelCollection.args = {
   showBulkMove: true,
   showBulkTrashOptions: false,
   useEvents: false,
-  editableCollections: false,
   cloneableOrganizationCiphers: false,
 };
 
@@ -201,7 +196,6 @@ OrganizationVault.args = {
   showBulkMove: false,
   showBulkTrashOptions: false,
   useEvents: true,
-  editableCollections: true,
   cloneableOrganizationCiphers: true,
 };
 
@@ -216,7 +210,6 @@ OrganizationTrash.args = {
   showBulkMove: false,
   showBulkTrashOptions: true,
   useEvents: true,
-  editableCollections: true,
   cloneableOrganizationCiphers: true,
 };
 
@@ -234,7 +227,6 @@ OrganizationTopLevelCollection.args = {
   showBulkMove: false,
   showBulkTrashOptions: false,
   useEvents: true,
-  editableCollections: true,
   cloneableOrganizationCiphers: true,
 };
 
@@ -249,7 +241,6 @@ OrganizationSecondLevelCollection.args = {
   showBulkMove: false,
   showBulkTrashOptions: false,
   useEvents: true,
-  editableCollections: true,
   cloneableOrganizationCiphers: true,
 };
 
diff --git a/apps/web/src/app/vault/core/password-reprompt.service.ts b/apps/web/src/app/vault/core/password-reprompt.service.ts
deleted file mode 100644
index 22bbcf44d7f..00000000000
--- a/apps/web/src/app/vault/core/password-reprompt.service.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service";
-
-import { PasswordRepromptComponent } from "../components/password-reprompt.component";
-
-@Injectable()
-export class PasswordRepromptService extends BasePasswordRepromptService {
-  component = PasswordRepromptComponent;
-}
diff --git a/apps/web/src/app/vault/core/views/collection-admin.view.ts b/apps/web/src/app/vault/core/views/collection-admin.view.ts
index c97dab8422e..a43fc5c235b 100644
--- a/apps/web/src/app/vault/core/views/collection-admin.view.ts
+++ b/apps/web/src/app/vault/core/views/collection-admin.view.ts
@@ -1,3 +1,4 @@
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { CollectionAccessDetailsResponse } from "@bitwarden/common/src/vault/models/response/collection.response";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
@@ -29,4 +30,12 @@ export class CollectionAdminView extends CollectionView {
 
     this.assigned = response.assigned;
   }
+
+  override canEdit(org: Organization): boolean {
+    return org?.canEditAnyCollection || (org?.canEditAssignedCollections && this.assigned);
+  }
+
+  override canDelete(org: Organization): boolean {
+    return org?.canDeleteAnyCollection || (org?.canDeleteAssignedCollections && this.assigned);
+  }
 }
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index 61dd6124b41..74e7a9e6e30 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -17,10 +17,10 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 @Component({
   selector: "app-vault-add-edit",
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
index 23761f2be8c..d760d088cb4 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
@@ -7,7 +7,9 @@ import { CollectionBulkDeleteRequest } from "@bitwarden/common/models/request/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { CipherBulkDeleteRequest } from "@bitwarden/common/vault/models/request/cipher-bulk-delete.request";
+import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { DialogService } from "@bitwarden/components";
 
 export interface BulkDeleteDialogParams {
@@ -15,6 +17,8 @@ export interface BulkDeleteDialogParams {
   collectionIds?: string[];
   permanent?: boolean;
   organization?: Organization;
+  organizations?: Organization[];
+  collections?: CollectionView[];
 }
 
 export enum BulkDeleteDialogResult {
@@ -45,6 +49,8 @@ export class BulkDeleteDialogComponent {
   collectionIds: string[];
   permanent = false;
   organization: Organization;
+  organizations: Organization[];
+  collections: CollectionView[];
 
   constructor(
     @Inject(DIALOG_DATA) params: BulkDeleteDialogParams,
@@ -52,12 +58,15 @@ export class BulkDeleteDialogComponent {
     private cipherService: CipherService,
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
-    private apiService: ApiService
+    private apiService: ApiService,
+    private collectionService: CollectionService
   ) {
     this.cipherIds = params.cipherIds ?? [];
     this.collectionIds = params.collectionIds ?? [];
     this.permanent = params.permanent;
     this.organization = params.organization;
+    this.organizations = params.organizations;
+    this.collections = params.collections;
   }
 
   protected async cancel() {
@@ -74,7 +83,7 @@ export class BulkDeleteDialogComponent {
       }
     }
 
-    if (this.collectionIds.length && this.organization) {
+    if (this.collectionIds.length) {
       deletePromises.push(this.deleteCollections());
     }
 
@@ -88,6 +97,7 @@ export class BulkDeleteDialogComponent {
       );
     }
     if (this.collectionIds.length) {
+      await this.collectionService.delete(this.collectionIds);
       this.platformUtilsService.showToast(
         "success",
         null,
@@ -116,19 +126,44 @@ export class BulkDeleteDialogComponent {
   }
 
   private async deleteCollections(): Promise<any> {
-    if (
-      !this.organization.canDeleteAssignedCollections &&
-      !this.organization.canDeleteAnyCollection
-    ) {
-      this.platformUtilsService.showToast(
-        "error",
-        this.i18nService.t("errorOccurred"),
-        this.i18nService.t("missingPermissions")
+    // From org vault
+    if (this.organization) {
+      if (
+        !this.organization.canDeleteAssignedCollections &&
+        !this.organization.canDeleteAnyCollection
+      ) {
+        this.platformUtilsService.showToast(
+          "error",
+          this.i18nService.t("errorOccurred"),
+          this.i18nService.t("missingPermissions")
+        );
+        return;
+      }
+      const deleteRequest = new CollectionBulkDeleteRequest(
+        this.collectionIds,
+        this.organization.id
       );
-      return;
+      return await this.apiService.deleteManyCollections(deleteRequest);
+      // From individual vault, so there can be multiple organizations
+    } else if (this.organizations && this.collections) {
+      const deletePromises: Promise<any>[] = [];
+      for (const organization of this.organizations) {
+        if (!organization.canDeleteAssignedCollections && !organization.canDeleteAnyCollection) {
+          this.platformUtilsService.showToast(
+            "error",
+            this.i18nService.t("errorOccurred"),
+            this.i18nService.t("missingPermissions")
+          );
+          return;
+        }
+        const orgCollections = this.collections
+          .filter((o) => o.organizationId === organization.id)
+          .map((c) => c.id);
+        const deleteRequest = new CollectionBulkDeleteRequest(orgCollections, organization.id);
+        deletePromises.push(this.apiService.deleteManyCollections(deleteRequest));
+      }
+      return await Promise.all(deletePromises);
     }
-    const deleteRequest = new CollectionBulkDeleteRequest(this.collectionIds, this.organization.id);
-    return await this.apiService.deleteManyCollections(deleteRequest);
   }
 
   private close(result: BulkDeleteDialogResult) {
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
index d497f15c42e..11cc196884c 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
@@ -28,6 +28,46 @@
         aria-hidden="true"
       ></i>
       <span>{{ title }}</span>
+      <ng-container *ngIf="collection !== undefined && (canEditCollection || canDeleteCollection)">
+        <button
+          bitIconButton="bwi-angle-down"
+          [bitMenuTriggerFor]="editCollectionMenu"
+          size="small"
+          type="button"
+          aria-haspopup
+        ></button>
+        <bit-menu #editCollectionMenu>
+          <button
+            type="button"
+            *ngIf="canEditCollection"
+            bitMenuItem
+            (click)="editCollection(CollectionDialogTabType.Info)"
+          >
+            <i class="bwi bwi-fw bwi-pencil-square" aria-hidden="true"></i>
+            {{ "editInfo" | i18n }}
+          </button>
+          <button
+            type="button"
+            *ngIf="canEditCollection"
+            bitMenuItem
+            (click)="editCollection(CollectionDialogTabType.Access)"
+          >
+            <i class="bwi bwi-fw bwi-users" aria-hidden="true"></i>
+            {{ "access" | i18n }}
+          </button>
+          <button
+            type="button"
+            *ngIf="canDeleteCollection"
+            bitMenuItem
+            (click)="deleteCollection()"
+          >
+            <span class="tw-text-danger">
+              <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
+              {{ "delete" | i18n }}
+            </span>
+          </button>
+        </bit-menu>
+      </ng-container>
       <small *ngIf="loading">
         <i
           class="bwi bwi-spinner bwi-spin text-muted"
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 3fbd5461917..7bcdf52b6a4 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
@@ -5,6 +5,7 @@ import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
+import { CollectionDialogTabType } from "../../components/collection-dialog";
 import {
   All,
   RoutedVaultFilterModel,
@@ -19,6 +20,7 @@ import {
 export class VaultHeaderComponent {
   protected Unassigned = Unassigned;
   protected All = All;
+  protected CollectionDialogTabType = CollectionDialogTabType;
 
   /**
    * Boolean to determine the loading state of the header.
@@ -29,36 +31,30 @@ export class VaultHeaderComponent {
   /** Current active filter */
   @Input() filter: RoutedVaultFilterModel;
 
-  /**
-   * All organizations that can be shown
-   */
+  /** All organizations that can be shown */
   @Input() organizations: Organization[] = [];
 
-  /**
-   * Currently selected collection
-   */
+  /** Currently selected collection */
   @Input() collection?: TreeNode<CollectionView>;
 
-  /**
-   * Whether 'Collection' option is shown in the 'New' dropdown
-   */
+  /** Whether 'Collection' option is shown in the 'New' dropdown */
   @Input() canCreateCollections: boolean;
 
-  /**
-   * Emits an event when the new item button is clicked in the header
-   */
+  /** Emits an event when the new item button is clicked in the header */
   @Output() onAddCipher = new EventEmitter<void>();
 
-  /**
-   * Emits an event when the new collection button is clicked in the 'New' dropdown menu
-   */
+  /** Emits an event when the new collection button is clicked in the 'New' dropdown menu */
   @Output() onAddCollection = new EventEmitter<null>();
 
-  /**
-   * Emits an event when the new folder button is clicked in the 'New' dropdown menu
-   */
+  /** Emits an event when the new folder button is clicked in the 'New' dropdown menu */
   @Output() onAddFolder = new EventEmitter<null>();
 
+  /** Emits an event when the edit collection button is clicked in the header */
+  @Output() onEditCollection = new EventEmitter<{ tab: CollectionDialogTabType }>();
+
+  /** Emits an event when the delete collection button is clicked in the header */
+  @Output() onDeleteCollection = new EventEmitter<void>();
+
   constructor(private i18nService: I18nService) {}
 
   /**
@@ -127,6 +123,40 @@ export class VaultHeaderComponent {
       .map((treeNode) => treeNode.node);
   }
 
+  get canEditCollection(): boolean {
+    // Only edit collections if not editing "Unassigned"
+    if (this.collection === undefined) {
+      return false;
+    }
+
+    // Otherwise, check if we can edit the specified collection
+    const organization = this.organizations.find(
+      (o) => o.id === this.collection?.node.organizationId
+    );
+    return this.collection.node.canEdit(organization);
+  }
+
+  async editCollection(tab: CollectionDialogTabType): Promise<void> {
+    this.onEditCollection.emit({ tab });
+  }
+
+  get canDeleteCollection(): boolean {
+    // Only delete collections if not deleting "Unassigned"
+    if (this.collection === undefined) {
+      return false;
+    }
+
+    // Otherwise, check if we can edit the specified collection
+    const organization = this.organizations.find(
+      (o) => o.id === this.collection?.node.organizationId
+    );
+    return this.collection.node.canDelete(organization);
+  }
+
+  deleteCollection() {
+    this.onDeleteCollection.emit();
+  }
+
   protected addCipher() {
     this.onAddCipher.emit();
   }
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 265bdec2cee..fdbecb0bcbc 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -25,6 +25,8 @@
         (onAddCipher)="addCipher()"
         (onAddCollection)="addCollection()"
         (onAddFolder)="addFolder()"
+        (onEditCollection)="editCollection(selectedCollection.node, $event.tab)"
+        (onDeleteCollection)="deleteCollection(selectedCollection.node)"
       ></app-vault-header>
       <app-callout type="warning" *ngIf="activeFilter.isDeleted" icon="bwi-exclamation-triangle">
         {{ trashCleanupWarning }}
@@ -42,7 +44,6 @@
         [showBulkMove]="showBulkMove"
         [showBulkTrashOptions]="filter.type === 'trash'"
         [useEvents]="false"
-        [editableCollections]="false"
         [cloneableOrganizationCiphers]="false"
         (onEvent)="onVaultItemsEvent($event)"
       >
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 35074c70d26..3b8d60d263b 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -30,6 +30,7 @@ import {
 
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
@@ -51,7 +52,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data";
@@ -59,8 +59,14 @@ import { CollectionDetailsResponse } from "@bitwarden/common/vault/models/respon
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { DialogService, Icons } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
-import { CollectionDialogAction, openCollectionDialog } from "../components/collection-dialog";
+import {
+  CollectionDialogAction,
+  CollectionDialogTabType,
+  openCollectionDialog,
+} from "../components/collection-dialog";
+import { VaultItem } from "../components/vault-items/vault-item";
 import { VaultItemEvent } from "../components/vault-items/vault-item-event";
 import { getNestedCollectionTree } from "../utils/collection-utils";
 
@@ -130,7 +136,7 @@ export class VaultComponent implements OnInit, OnDestroy {
   protected showBulkMove: boolean;
   protected canAccessPremium: boolean;
   protected allCollections: CollectionView[];
-  protected allOrganizations: Organization[];
+  protected allOrganizations: Organization[] = [];
   protected ciphers: CipherView[];
   protected collections: CollectionView[];
   protected isEmpty: boolean;
@@ -170,6 +176,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     private searchService: SearchService,
     private searchPipe: SearchPipe,
     private configService: ConfigServiceAbstraction,
+    private apiService: ApiService,
     private userVerificationService: UserVerificationService
   ) {}
 
@@ -430,12 +437,7 @@ export class VaultComponent implements OnInit, OnDestroy {
           await this.bulkRestore(event.items);
         }
       } else if (event.type === "delete") {
-        const ciphers = event.items.filter((i) => i.collection === undefined).map((i) => i.cipher);
-        if (ciphers.length === 1) {
-          await this.deleteCipher(ciphers[0]);
-        } else {
-          await this.bulkDelete(ciphers);
-        }
+        await this.handleDeleteEvent(event.items);
       } else if (event.type === "moveToFolder") {
         await this.bulkMove(event.items);
       } else if (event.type === "moveToOrganization") {
@@ -446,6 +448,10 @@ export class VaultComponent implements OnInit, OnDestroy {
         }
       } else if (event.type === "copyField") {
         await this.copy(event.item, event.field);
+      } else if (event.type === "editCollection") {
+        await this.editCollection(event.item, CollectionDialogTabType.Info);
+      } else if (event.type === "viewCollectionAccess") {
+        await this.editCollection(event.item, CollectionDialogTabType.Access);
       }
     } finally {
       this.processingEvent = false;
@@ -652,10 +658,65 @@ export class VaultComponent implements OnInit, OnDestroy {
         await this.collectionService.upsert(c);
       }
       this.refresh();
-    } else if (result.action === CollectionDialogAction.Deleted) {
-      // TODO: Remove collection from collectionService when collection
-      // deletion is implemented in the individual vault in AC-1347
+    }
+  }
+
+  async editCollection(c: CollectionView, tab: CollectionDialogTabType): Promise<void> {
+    const dialog = openCollectionDialog(this.dialogService, {
+      data: { collectionId: c?.id, organizationId: c.organizationId, initialTab: tab },
+    });
+
+    const result = await lastValueFrom(dialog.closed);
+    if (result.action === CollectionDialogAction.Saved) {
+      if (result.collection) {
+        // Update CollectionService with the new collection
+        const c = new CollectionData(result.collection as CollectionDetailsResponse);
+        await this.collectionService.upsert(c);
+      }
       this.refresh();
+    } else if (result.action === CollectionDialogAction.Deleted) {
+      await this.collectionService.delete(result.collection?.id);
+      this.refresh();
+    }
+  }
+
+  async deleteCollection(collection: CollectionView): Promise<void> {
+    const organization = this.organizationService.get(collection.organizationId);
+    if (!organization.canDeleteAssignedCollections && !organization.canDeleteAnyCollection) {
+      this.platformUtilsService.showToast(
+        "error",
+        this.i18nService.t("errorOccurred"),
+        this.i18nService.t("missingPermissions")
+      );
+      return;
+    }
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: collection.name,
+      content: { key: "deleteCollectionConfirmation" },
+      type: "warning",
+    });
+    if (!confirmed) {
+      return;
+    }
+    try {
+      await this.apiService.deleteCollection(collection.organizationId, collection.id);
+      await this.collectionService.delete(collection.id);
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("deletedCollectionId", collection.name)
+      );
+      // Navigate away if we deleted the collection we were viewing
+      if (this.selectedCollection?.node.id === collection.id) {
+        this.router.navigate([], {
+          queryParams: { collectionId: this.selectedCollection.parent?.node.id ?? null },
+          queryParamsHandling: "merge",
+          replaceUrl: true,
+        });
+      }
+      this.refresh();
+    } catch (e) {
+      this.logService.error(e);
     }
   }
 
@@ -702,6 +763,26 @@ export class VaultComponent implements OnInit, OnDestroy {
     this.refresh();
   }
 
+  private async handleDeleteEvent(items: VaultItem[]) {
+    const ciphers = items.filter((i) => i.collection === undefined).map((i) => i.cipher);
+    const collections = items.filter((i) => i.cipher === undefined).map((i) => i.collection);
+    if (ciphers.length === 1 && collections.length === 0) {
+      await this.deleteCipher(ciphers[0]);
+    } else if (ciphers.length === 0 && collections.length === 1) {
+      await this.deleteCollection(collections[0]);
+    } else {
+      const orgIds = items
+        .filter((i) => i.cipher === undefined)
+        .map((i) => i.collection.organizationId);
+      const orgs = await firstValueFrom(
+        this.organizationService.organizations$.pipe(
+          map((orgs) => orgs.filter((o) => orgIds.includes(o.id)))
+        )
+      );
+      await this.bulkDelete(ciphers, collections, orgs);
+    }
+  }
+
   async deleteCipher(c: CipherView): Promise<boolean> {
     if (!(await this.repromptCipher([c]))) {
       return;
@@ -732,13 +813,16 @@ export class VaultComponent implements OnInit, OnDestroy {
     }
   }
 
-  async bulkDelete(ciphers: CipherView[]) {
+  async bulkDelete(
+    ciphers: CipherView[],
+    collections: CollectionView[],
+    organizations: Organization[]
+  ) {
     if (!(await this.repromptCipher(ciphers))) {
       return;
     }
 
-    const selectedIds = ciphers.map((cipher) => cipher.id);
-    if (selectedIds.length === 0) {
+    if (ciphers.length === 0 && collections.length === 0) {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
@@ -747,7 +831,13 @@ export class VaultComponent implements OnInit, OnDestroy {
       return;
     }
     const dialog = openBulkDeleteDialog(this.dialogService, {
-      data: { permanent: this.filter.type === "trash", cipherIds: selectedIds },
+      data: {
+        permanent: this.filter.type === "trash",
+        cipherIds: ciphers.map((c) => c.id),
+        collectionIds: collections.map((c) => c.id),
+        organizations: organizations,
+        collections: collections,
+      },
     });
 
     const result = await lastValueFrom(dialog.closed);
diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts
index bea55856a4a..c8a37c087ad 100644
--- a/apps/web/src/app/vault/org-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts
@@ -16,10 +16,10 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AddEditComponent as BaseAddEditComponent } from "../individual-vault/add-edit.component";
 
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
index 9282e237af3..2d3f2c156b0 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
@@ -141,10 +141,7 @@ export class VaultHeaderComponent {
     }
 
     // Otherwise, check if we can edit the specified collection
-    return (
-      this.organization.canEditAnyCollection ||
-      (this.organization.canEditAssignedCollections && this.collection?.node.assigned)
-    );
+    return this.collection.node.canEdit(this.organization);
   }
 
   addCipher() {
@@ -174,10 +171,7 @@ export class VaultHeaderComponent {
     }
 
     // Otherwise, check if we can delete the specified collection
-    return (
-      this.organization?.canDeleteAnyCollection ||
-      (this.organization?.canDeleteAssignedCollections && this.collection.node.assigned)
-    );
+    return this.collection.node.canDelete(this.organization);
   }
 
   deleteCollection() {
diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html
index c586a94f7aa..360e4c57b50 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.html
+++ b/apps/web/src/app/vault/org-vault/vault.component.html
@@ -51,7 +51,6 @@
         [showBulkMove]="false"
         [showBulkTrashOptions]="filter.type === 'trash'"
         [useEvents]="organization?.useEvents"
-        [editableCollections]="true"
         [cloneableOrganizationCiphers]="true"
         (onEvent)="onVaultItemsEvent($event)"
       >
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 1cb57e188a9..dcdd73da3c4 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -47,12 +47,12 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { DialogService, Icons } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { GroupService, GroupView } from "../../admin-console/organizations/core";
 import { openEntityEventsDialog } from "../../admin-console/organizations/manage/entity-events.component";
@@ -495,9 +495,9 @@ export class VaultComponent implements OnInit, OnDestroy {
         }
       } else if (event.type === "copyField") {
         await this.copy(event.item, event.field);
-      } else if (event.type === "edit") {
+      } else if (event.type === "editCollection") {
         await this.editCollection(event.item, CollectionDialogTabType.Info);
-      } else if (event.type === "viewAccess") {
+      } else if (event.type === "viewCollectionAccess") {
         await this.editCollection(event.item, CollectionDialogTabType.Access);
       } else if (event.type === "viewEvents") {
         await this.viewEvents(event.item);
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index 0f57c449591..017e170ecd3 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Teken aan met hoofwagwoord"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Skep rekening"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "vereis"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maksimum $MAX$ karakters",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Aan"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Lede"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index b21a4e49d18..19971c613b7 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "تسجيل الدخول باستخدام كلمة المرور الرئيسية"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "إنشاء حساب"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "مطلوب"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "الأعضاء"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index 151d237b91e..e115c210540 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Ana parolla giriş et"
   },
+  "loginWithPasskey": {
+    "message": "Parolla giriş et"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "Yeni parol"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Parolsuz haqqında daha ətraflı"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Parol ayarlarına sahib girişi dəyişdirmək üçün ana parolunuzu daxil edin."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Özəl ad"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Şifrələmə dəstəklənmir"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saxlanıldı",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Parol silindi"
+  },
+  "removePasskey": {
+    "message": "Parolu sil"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Yenidən sına"
+  },
   "createAccount": {
     "message": "Hesab yarat"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "tələb olunur"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ simvol",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "maksimum $MAX$ simvol",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Açıqdır"
   },
+  "off": {
+    "message": "Bağlı"
+  },
   "members": {
     "message": "Üzvlər"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "\"Secrets Manager\"ə abunə ol"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7170,12 +7252,18 @@
     "message": "Beta"
   },
   "baseUrl": {
-    "message": "Server URL"
+    "message": "Server URL-si"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Domen ləqəbi"
   },
   "alreadyHaveAccount": {
     "message": "Artıq bir hesabınız var?"
+  },
+  "customBillingStart": {
+    "message": "Özəl faktura əks olunmur. Son faktura üçün "
+  },
+  "customBillingEnd": {
+    "message": " səhifəni ziyarət edin."
   }
 }
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index 8ead5f134b1..cbebeeacf1f 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -226,7 +226,7 @@
     "message": "Праверце, ці не скампраметаваны пароль."
   },
   "passwordExposed": {
-    "message": "Гэты пароль быў скампраметаваны наступную колькасць разоў: $VALUE$. Вы павінны змяніць яго.",
+    "message": "Гэты пароль быў скампраметаваны наступную колькасць раз(оў): $VALUE$. Вы павінны змяніць яго.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Увайсці з асноўным паролем"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Стварыць уліковы запіс"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "патрабуецца"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Максімум $MAX$ сімвалаў",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Уключана"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Удзельнікі"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Дадаць менеджар сакрэтаў"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Дадаць менеджар сакрэтаў у ваш абноўлены тарыфны план, каб падтрымліваць доступ да любых сакрэтаў, якія былі створаны з дапамогай вашых папярэдніх тарыфных планаў."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Ужо маеце ўліковы запіс?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index f8c2bd5c15b..5074795c58a 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Вписване с главната парола"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Нов опит"
+  },
   "createAccount": {
     "message": "Създаване на абонамент"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "задължително"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "Максимален брой знаци: $CURRENT$/$MAX$",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Максимален брой знаци: $MAX$",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Включено"
   },
+  "off": {
+    "message": "Изключено"
+  },
   "members": {
     "message": "Членове"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Добавяне на Управление на тайни"
+  "subscribeToSecretsManager": {
+    "message": "Абониране за Управлението на тайни"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Добавете Управление на тайни към своя надграден план, за да продължите да имате достъп до тайните създадени при предишния Ви план."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Вече имате регистрация?"
+  },
+  "customBillingStart": {
+    "message": "Персонализираното таксуване не е отразено. Посетете страницата за "
+  },
+  "customBillingEnd": {
+    "message": " за последните фактури."
   }
 }
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 2d5a3f43794..c111b48b444 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "অ্যাকাউন্ট তৈরি"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index 220ad900cc8..c78a2207f5e 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index a2276a8443c..96f1b5596d4 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Inici de sessió amb contrasenya mestra"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Crea un compte"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "requerit"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ caràcters màxim",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Activat"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Membres"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Afig administrador de secrets"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Afegiu administrador de secrets al vostre pla actualitzat per mantindre l'accés a tots els secrets creats amb el vostre pla anterior."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Ja tens un compte?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 1ca1c246d2f..843c805089c 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Přihlásit se pomocí hlavního hesla"
   },
+  "loginWithPasskey": {
+    "message": "Přihlásit se pomocí přístupového klíče"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Použijte vygenerovaný přístupový klíč, který Vás automaticky přihlásí bez hesla. Biometriky, jako je rozpoznávání obličeje, otisky prstů nebo jiná bezpečnostní metoda FIDO2 ověří Vaši totožnost."
+  },
+  "newPasskey": {
+    "message": "Nové přístupový klíč"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Další informace o přihlášení bez hesla"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Zadejte Vaše hlavní heslo pro úpravu dvoufázového přihlášení."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Vytváření přístupového klíče..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Ponechte toto okno otevřené a postupujte podle dotazů z Vašeho prohlížeče."
+  },
+  "errorCreatingPasskey": {
+    "message": "Chyba při vytváření přístupového klíče"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Vyskytl se problém při vytváření přístupového klíče."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Přístupový klíč byl úspěšně vytvořen!"
+  },
+  "customName": {
+    "message": "Vlastní název"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Pojmenujte Váš přístupový klíč, abyste jej mohli snáze identifikovat."
+  },
+  "encryptionNotSupported": {
+    "message": "Šifrování není podporováno"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Přihlásit se se zapnutým přístupovým klíčem"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ uloženo",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Přístupový klíč byl odebrán"
+  },
+  "removePasskey": {
+    "message": "Odebrat přístupový klíč"
+  },
+  "removePasskeyInfo": {
+    "message": "Pokud budou odebrány všechny přístupové klíče, nebudete se moci přihlásit do nových zařízení bez hlavního hesla."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Byl dosažen limit přístupového klíče. Chcete-li přidat další, odeberte nějaký."
+  },
+  "tryAgain": {
+    "message": "Zkusit znovu"
+  },
   "createAccount": {
     "message": "Vytvořit účet"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "vyžadováno"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ znaků maximálně",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maximálně $MAX$ znaků",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Zapnuto"
   },
+  "off": {
+    "message": "VYP."
+  },
   "members": {
     "message": "Členové"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Přidat správce tajných klíčů"
+  "subscribeToSecretsManager": {
+    "message": "Přihlásit se ke správci klíčů"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Přidáním správce klíčů k aktualizovanému plánu si zachováte přístup ke všem klíčům vytvořeným v předchozím plánu."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Už máte účet?"
+  },
+  "customBillingStart": {
+    "message": "Vlastní fakturace není zahrnuta. Navštivte stránku "
+  },
+  "customBillingEnd": {
+    "message": " pro nejnovější faktury."
   }
 }
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index ca615764d5c..d5db4ca110e 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log ind med hovedadgangskode"
   },
+  "loginWithPasskey": {
+    "message": "Log ind med adgangsnøgle"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Brug en genereret adgangsnøgle, der automatisk logger dig ind uden en adgangskode. Biometri, såsom ansigtsgenkendelse eller fingeraftryk, eller en anden FIDO2-sikkerhedsmetode, vil bekræfte din identitet."
+  },
+  "newPasskey": {
+    "message": "Ny adgangsnøgle"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Læs mere om adgangskodefrihed"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Angiv hovedadgangskoden for at ændre loginindstillinger for adgangsnøgle."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Opretter adgangsnøgle..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Hold dette vindue åbent, og følg prompterne fra webbrowseren."
+  },
+  "errorCreatingPasskey": {
+    "message": "Fejl ved oprettelse af adgangsnøgle"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Der opstod et problem med at oprette adgangsnøglen."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Adgangsnøgle hermed oprettet!"
+  },
+  "customName": {
+    "message": "Tilpasset navn"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Navngiv adgangsnøglen for at hjælpe dig med at identificere den."
+  },
+  "encryptionNotSupported": {
+    "message": "Kryptering ikke understøttet"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log ind med adgangsnøgle slået til"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ gemt",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Adgangsnøgle fjernet"
+  },
+  "removePasskey": {
+    "message": "Fjern adgangsnøgle"
+  },
+  "removePasskeyInfo": {
+    "message": "Fjernes alle adgangsnøgler, vil du ikke kunne logge ind på nye enheder uden hovedadgangskoden."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Adgangsnøglekvote nået. Fjern en adgangsnøgle for at tilføje en anden."
+  },
+  "tryAgain": {
+    "message": "Forsøg igen"
+  },
   "createAccount": {
     "message": "Opret konto"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obligatorisk"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ tegn maksimalt",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maksimalt $MAX$ tegn",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Til"
   },
+  "off": {
+    "message": "Fra"
+  },
   "members": {
     "message": "Medlemmer"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Tilføj Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Abonnér på Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Føj Secrets Manager til den opgraderede abonnementstype for at bibeholde adgang til alle hemmeligheder oprettet med det tidligere abonnement."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Har allerede en konto?"
+  },
+  "customBillingStart": {
+    "message": "Tilpasset fakturering vises ikke. Besøg siden "
+  },
+  "customBillingEnd": {
+    "message": " for seneste fakturering."
   }
 }
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index f48baa55bcf..f988a6b988f 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Mit Master-Passwort anmelden"
   },
+  "loginWithPasskey": {
+    "message": "Mit Passkey anmelden"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Verwende einen generierten Passkey, der dich automatisch ohne Passwort anmeldet. Biometrische Merkmale wie Gesichtserkennung oder Fingerabdruck oder eine andere FIDO2-Sicherheitsmethode verifizieren deine Identität."
+  },
+  "newPasskey": {
+    "message": "Neuer Passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Gib dein Master-Passwort ein, um die Einstellungen für die Anmeldung mit Passkeys zu ändern."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Passkey wird erstellt..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Behalte dieses Fenster offen und folge den Anweisungen deines Browsers."
+  },
+  "errorCreatingPasskey": {
+    "message": "Fehler beim Erstellen des Passkeys."
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Es gab ein Problem beim Erstellen deines Passkeys."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey erfolgreich erstellt!"
+  },
+  "customName": {
+    "message": "Benutzerdefinierter Name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Benenne deinen Passkey, um ihn zu identifizieren."
+  },
+  "encryptionNotSupported": {
+    "message": "Verschlüsselung nicht unterstützt"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Anmeldung mit Passkey aktiviert"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ gespeichert",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey gelöscht"
+  },
+  "removePasskey": {
+    "message": "Passkey löschen"
+  },
+  "removePasskeyInfo": {
+    "message": "Wenn alle Passkeys entfernt werden, kannst du dich ohne dein Master-Passwort nicht auf neuen Geräten anmelden."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey-Limit erreicht. Entferne einen Passkey, um ein weiteren hinzuzufügen."
+  },
+  "tryAgain": {
+    "message": "Erneut versuchen"
+  },
   "createAccount": {
     "message": "Konto erstellen"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "erforderlich"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ erlaubten Zeichen",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maximal $MAX$ Zeichen",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Ein"
   },
+  "off": {
+    "message": "Aus"
+  },
   "members": {
     "message": "Mitglieder"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Secrets Manager hinzufügen"
+  "subscribeToSecretsManager": {
+    "message": "Secrets Manager abonnieren"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Füge den Secrets Manager zu deinem aktualisierten Abonnement hinzu, um den Zugriff auf alle Geheimnisse zu erhalten, die mit deinem vorherigen Abonnement erstellt wurden."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Hast du bereits ein Konto?"
+  },
+  "customBillingStart": {
+    "message": "Eine individuelle Abrechnung wird nicht berücksichtigt. Besuche die "
+  },
+  "customBillingEnd": {
+    "message": " Seite für die aktuelle Rechnung."
   }
 }
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index b146e47ddc5..55ebf648905 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Συνδεθείτε με τον κύριο κωδικό πρόσβασης"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Δημιουργία Λογαριασμού"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "απαιτείται"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 0236e5fecb9..60fed7a538e 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -3638,6 +3638,18 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "secretsAccessSuspended": {
+    "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
+  },  
+  "secretsCannotCreate": {
+    "message": "Secrets cannot be created in suspended organizations. Please contact your organization owner for assistance."
+  },
+  "projectsCannotCreate": {
+    "message": "Projects cannot be created in suspended organizations. Please contact your organization owner for assistance."
+  },
+  "serviceAccountsCannotCreate": {
+    "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+  },
   "disabledOrganizationFilterError": {
     "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
   },
@@ -7178,8 +7190,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index 0810036fc16..b91dfccd05f 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index 3df21cfb599..da2447e4df4 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index b96027b9d4e..d44056e11f6 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Saluti kun la ĉefpasvorto"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Krei konton"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "deviga"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Ŝaltita"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index f313f9ba16d..0b6740ffe3c 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Iniciar sesión con contraseña maestra"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Crear cuenta"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "requerido"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ caracteres como máximo",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Activado"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Miembros"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "¿Ya tienes una cuenta?"
+  },
+  "customBillingStart": {
+    "message": "Facturación personalizada no reflejada. Visite el "
+  },
+  "customBillingEnd": {
+    "message": " para la última facturación."
   }
 }
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 1a56831f0fd..bcb56734b17 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Logi sisse ülemparooliga"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Konto loomine"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index e50570a9b68..569edfc4751 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Hasi saioa pasahitz nagusiarekin"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Sortu kontua"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "beharrezkoa"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Piztuta"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Kideak"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index 51e292d2d9e..2c9af8a8dbd 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "با کلمه عبور اصلی وارد شوید"
   },
+  "loginWithPasskey": {
+    "message": "با کلید عبور وارد شوید"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "از یک کلمه عبور ایجاد شده استفاده کنید که به طور خودکار بدون کلمه عبور شما را وارد می‌کند. بیومتریک‌ها، مانند تشخیص چهره یا اثر انگشت، یا سایر روش‌های امنیتی FIDO2 هویت شما را تأیید می‌کنند."
+  },
+  "newPasskey": {
+    "message": "کلمه عبور جدید"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "درباره بدون کلمه عبور بیشتر بدانید"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "کلمه عبور اصلی خود را برای تغییر ورود با تنظیمات کلید عبور وارد کنید."
+  },
+  "creatingPasskeyLoading": {
+    "message": "ایجاد کلید عبور..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "این پنجره را باز نگه دارید و دستورهای مرورگر خود را دنبال کنید."
+  },
+  "errorCreatingPasskey": {
+    "message": "خطا در ایجاد کلید عبور"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "مشکلی در ایجاد کلید عبور شما وجود داشت."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "کلید عبور با موفقیت ایجاد شد!"
+  },
+  "customName": {
+    "message": "نام سفارشی"
+  },
+  "customPasskeyNameInfo": {
+    "message": "کلید عبور خود را برای کمک به شناسایی آن نام ببرید."
+  },
+  "encryptionNotSupported": {
+    "message": "رمزگذاری پشتیبانی نمی‌شود"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "با فعال بودن کلید ورود وارد شوید"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ ذخیره شد",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "کلید عبور حذف شد"
+  },
+  "removePasskey": {
+    "message": "حذف کلید عبور"
+  },
+  "removePasskeyInfo": {
+    "message": "اگر همه کلیدهای عبور حذف شوند، نمی‌توانید بدون کلمه عبور اصلی خود وارد دستگاه‌های جدید شوید."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "به حد مجاز کلید عبور رسیده است. برای افزودن کلید عبور دیگر، کلید عبور را حذف کنید."
+  },
+  "tryAgain": {
+    "message": "دوباره امتحان کن"
+  },
   "createAccount": {
     "message": "ایجاد حساب کاربری"
   },
@@ -709,7 +775,7 @@
     "message": "یک خطای غیر منتظره رخ داده است."
   },
   "expirationDateError": {
-    "message": "Please select an expiration date that is in the future."
+    "message": "لطفاً تاریخ انقضایی را انتخاب کنید که در آینده است."
   },
   "emailAddress": {
     "message": "نشانی ایمیل"
@@ -952,7 +1018,7 @@
     "message": "کپی کد تأیید"
   },
   "copyUuid": {
-    "message": "Copy UUID"
+    "message": "کپی UUID"
   },
   "warning": {
     "message": "هشدار"
@@ -1291,19 +1357,19 @@
     "message": "خطا در رمزگشایی پرونده‌ی درون ریزی شده. کلید رمزگذاری شما با کلید رمزگذاری استفاده شده برای درون ریزی داده‌ها مطابقت ندارد."
   },
   "importDestination": {
-    "message": "Import destination"
+    "message": "مقصد برون ریزی"
   },
   "learnAboutImportOptions": {
-    "message": "Learn about your import options"
+    "message": "درباره گزینه‌های برون ریزی خود بیاموزید"
   },
   "selectImportFolder": {
-    "message": "Select a folder"
+    "message": "یک پوشه انتخاب کنید"
   },
   "selectImportCollection": {
-    "message": "Select a collection"
+    "message": "انتخاب یک مجموعه"
   },
   "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
+    "message": "اگر می‌خواهید محتوای فایل وارد شده به $DESTINATION$ منتقل شود، این گزینه را انتخاب کنید",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -1313,7 +1379,7 @@
     }
   },
   "importUnassignedItemsError": {
-    "message": "File contains unassigned items."
+    "message": "فایل حاوی موارد اختصاص نیافته است."
   },
   "selectFormat": {
     "message": "فرمت پرونده‌ی درون ریزی را انتخاب کنید"
@@ -1423,10 +1489,10 @@
     "message": "با درخواست یک مرحله اضافی هنگام ورود، حساب خود را ایمن کنید."
   },
   "twoStepLoginTeamsDesc": {
-    "message": "Enable two-step login for your organization."
+    "message": "ورود دو مرحله ای را برای سازمان خود فعال کنید."
   },
   "twoStepLoginEnterpriseDescStart": {
-    "message": "Enforce Bitwarden Two-step Login options for members by using the ",
+    "message": "گزینه‌های ورود دو مرحله ای Bitwarden را برای اعضا اعمال کنید با استفاده از ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
@@ -1925,7 +1991,7 @@
     "message": "۱ گیگابایت فضای ذخیره‌سازی رمزنگاری شده برای پرونده‌های پیوست."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Proprietary two-step login options such as YubiKey and Duo."
+    "message": "گزینه های ورود اضافی دو مرحله ای مانند YubiKey و Duo."
   },
   "premiumSignUpEmergency": {
     "message": "دسترسی اضطراری"
@@ -2041,7 +2107,7 @@
     }
   },
   "paymentChargedWithUnpaidSubscription": {
-    "message": "Your payment method will be charged for any unpaid subscriptions."
+    "message": "روش پرداخت شما برای هرگونه اشتراک پرداخت نشده شارژ خواهد شد."
   },
   "paymentChargedWithTrial": {
     "message": "طرح شما با یک دوره آزمایشی رایگان ۷ روزه همراه است. تا پایان دوره آزمایشی از روش پرداخت شما هزینه ای کسر نمی‌شود. هر زمان که مایل بودید می‌توانید آن را لغو کنید."
@@ -3477,7 +3543,7 @@
     "message": "کلید رمزگذاری را به‌روز کنید"
   },
   "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
+    "message": "ما طرح رمزگذاری را برای ارائه امنیت بهتر تغییر داده‌ایم. کلید رمزگذاری خود را اکنون با وارد کردن کلمه اصلی خود در زیر به روز کنید."
   },
   "updateEncryptionKeyWarning": {
     "message": "پس از به‌روزرسانی کلید رمزگذاری، باید از سیستم خارج شوید و دوباره به همه برنامه‌های Bitwarden که در حال حاضر استفاده می‌کنید (مانند برنامه تلفن همراه یا برنامه‌های افزودنی مرورگر) وارد شوید. عدم خروج و ورود مجدد (که کلید رمزگذاری جدید شما را دانلود می‌کند) ممکن است منجر به خراب شدن داده‌ها شود. ما سعی خواهیم کرد شما را به طور خودکار از سیستم خارج کنیم، اما ممکن است با تأخیر انجام شود."
@@ -3534,7 +3600,7 @@
     "message": "انتخاب کنید که گاو‌صندوق شما چه زمانی عمل توقف زمانی گاوصندوق را انجام دهد."
   },
   "vaultTimeoutLogoutDesc": {
-    "message": "Choose when your vault will be logged out."
+    "message": "انتخاب کنید که گاوصندوق شما چه زمانی از سیستم خارج می‌شود."
   },
   "oneMinute": {
     "message": "۱ دقیقه"
@@ -3625,7 +3691,7 @@
     "message": "این مورد دارای پرونده های پیوست قدیمی است که باید اصلاح شوند."
   },
   "attachmentFixDescription": {
-    "message": "This attachment uses outdated encryption. Select 'Fix' to download, re-encrypt, and re-upload the attachment."
+    "message": "این پیوست از رمزگذاری قدیمی استفاده می‌کند. برای دانلود، رمزگذاری مجدد، و بارگذاری مجدد پیوست، «اصلاح» را انتخاب کنید."
   },
   "fix": {
     "message": "اصلاح",
@@ -4721,7 +4787,7 @@
     "message": "خطا"
   },
   "accountRecoveryManageUsers": {
-    "message": "Manage users must also be granted with the manage account recovery permission"
+    "message": "مدیر کاربران همچنین باید مجوز مدیریت بازیابی حساب کاربری را داشته باشد"
   },
   "setupProvider": {
     "message": "راه اندازی ارائه دهنده"
@@ -4933,7 +4999,7 @@
     "message": "حذف برون ریزی گاوصندوق شخصی"
   },
   "disablePersonalVaultExportDescription": {
-    "message": "Do not allow members to export data from their individual vault."
+    "message": "به اعضا اجازه ندهید که داده‌های گاوصندوق شخصی خود را برون ریزی کنند."
   },
   "vaultExportDisabled": {
     "message": "برون ریزی گاوصندوق غیرفعال شده است"
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "الزامی است"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "حداکثر کاراکتر $CURRENT$/$MAX$",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "حداکثر کاراکتر $MAX$",
     "placeholders": {
@@ -5437,7 +5516,7 @@
     "message": "در حال برون ریزی گاوصندوق سازمان"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "فقط موارد شخصی گاوصندوق مرتبط با $EMAIL$ برون ریزی خواهند شد. موارد گاوصندوق سازمان شامل نخواهد شد. فقط اطلاعات مورد گاوصندوق برون ریزی خواهد شد و شامل تاریخچه کلمه عبور مرتبط یا پیوست نمی‌شود.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5446,7 +5525,7 @@
     }
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
+    "message": "فقط گاوصدوق سازمان مرتبط با $ORGANIZATION$ برون ریزی خواهد شد. موارد موجود در گاوصندوق‌های فردی یا سایر سازمان‌ها شامل نمی‌شوند.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "روشن"
   },
+  "off": {
+    "message": "خاموش"
+  },
   "members": {
     "message": "اعضا"
   },
@@ -6836,58 +6918,58 @@
     "message": "تنظیمات KDF را به‌روز کنید"
   },
   "loginInitiated": {
-    "message": "Login initiated"
+    "message": "ورود به سیستم آغاز شد"
   },
   "deviceApprovalRequired": {
-    "message": "Device approval required. Select an approval option below:"
+    "message": "تأیید دستگاه لازم است. یک روش تأیید انتخاب کنید:"
   },
   "rememberThisDevice": {
-    "message": "Remember this device"
+    "message": "این دستگاه را به خاطر بسپار"
   },
   "uncheckIfPublicDevice": {
-    "message": "Uncheck if using a public device"
+    "message": "اگر از دستگاه عمومی استفاده می‌کنید علامت را بردارید"
   },
   "approveFromYourOtherDevice": {
-    "message": "Approve from your other device"
+    "message": "تأیید با دستگاه دیگرتان"
   },
   "requestAdminApproval": {
-    "message": "Request admin approval"
+    "message": "درخواست تأیید مدیر"
   },
   "approveWithMasterPassword": {
-    "message": "Approve with master password"
+    "message": "تأیید با کلمه عبور اصلی"
   },
   "trustedDeviceEncryption": {
-    "message": "Trusted device encryption"
+    "message": "رمزگذاری دستگاه مورد اعتماد"
   },
   "trustedDevices": {
-    "message": "Trusted devices"
+    "message": "دستگاه‌های مورد اعتماد"
   },
   "memberDecryptionOptionTdeDescriptionPartOne": {
-    "message": "Once authenticated, members will decrypt vault data using a key stored on their device. The",
+    "message": "پس از احراز هویت، اعضا با استفاده از کلید ذخیره شده در دستگاه خود، داده‌های گاوصندوق را رمزگشایی می‌کنند.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO Required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionLinkOne": {
-    "message": "single organization",
+    "message": "سازمان واحد",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionPartTwo": {
-    "message": "policy,",
+    "message": "سیاست‌ها",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionLinkTwo": {
-    "message": "SSO required",
+    "message": "SSO الزامی است",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionPartThree": {
-    "message": "policy, and",
+    "message": "سیاست‌ها و",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionLinkThree": {
-    "message": "account recovery administration",
+    "message": "مدیریت بازیابی حساب کاربری",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescriptionPartFour": {
-    "message": "policy with automatic enrollment will turn on when this option is used.",
+    "message": "سیاست‌ها با ثبت نام خودکار زمانی که از این گزینه استفاده می‌شود روشن می‌شود.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
   "notFound": {
@@ -6978,7 +7060,7 @@
     "message": "حذف اعضایی که کلمه عبور اصلی ندارند بدون تعیین کلمه عبور برای آنها ممکن است دسترسی به حساب کامل آن‌ها را محدود کند."
   },
   "approvedAuthRequest": {
-    "message": "Approved device for $ID$.",
+    "message": "دستگاه تأیید شده برای $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -6987,7 +7069,7 @@
     }
   },
   "rejectedAuthRequest": {
-    "message": "Denied device for $ID$.",
+    "message": "دستگاه رد شده برای $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -6996,7 +7078,7 @@
     }
   },
   "requestedDeviceApproval": {
-    "message": "Requested device approval."
+    "message": "تأیید دستگاه درخواست."
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
     "message": "نسخه آزمایشی رایگان ۷ روزه Bitwarden را با $ORG$ شروع کنید",
@@ -7014,28 +7096,28 @@
     "message": "پرچم منطقه انتخاب شد"
   },
   "accountSuccessfullyCreated": {
-    "message": "Account successfully created!"
+    "message": "حساب کاربری با موفقیت ایجاد شد!"
   },
   "adminApprovalRequested": {
-    "message": "Admin approval requested"
+    "message": "تأیید مدیر درخواست شد"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Your request has been sent to your admin."
+    "message": "درخواست شما به مدیرتان فرستاده شد."
   },
   "youWillBeNotifiedOnceApproved": {
-    "message": "You will be notified once approved."
+    "message": "به محض تأیید مطلع خواهید شد."
   },
   "troubleLoggingIn": {
-    "message": "Trouble logging in?"
+    "message": "در ورود مشکلی دارید؟"
   },
   "loginApproved": {
-    "message": "Login approved"
+    "message": "ورود تأیید شد"
   },
   "userEmailMissing": {
-    "message": "User email missing"
+    "message": "ایمیل کاربر وجود ندارد"
   },
   "deviceTrusted": {
-    "message": "Device trusted"
+    "message": "دستگاه مورد اعتماد است"
   },
   "sendsNoItemsTitle": {
     "message": "ارسال‌های فعالی نیست",
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "افزودن مدیر رازها"
+  "subscribeToSecretsManager": {
+    "message": "دنبال کردن مدیر اسرار"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "مدیر رازها را به برنامه ارتقا یافته خود اضافه کنید تا دسترسی به رازهای ایجاد شده با برنامه قبلی خود را حفظ کنید."
@@ -7106,7 +7188,7 @@
     "message": "حساب‌های خدمات اضافی"
   },
   "includedServiceAccounts": {
-    "message": "Your plan comes with $COUNT$ service accounts.",
+    "message": "طرح شما با حساب خدمات $COUNT$ همراه است.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7115,7 +7197,7 @@
     }
   },
   "addAdditionalServiceAccounts": {
-    "message": "You can add additional service accounts for $COST$ per month.",
+    "message": "می‌توانید سرویس اضافی حساب‌ها را با $COST$ در ماه اضافه کنید.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -7148,10 +7230,10 @@
     "message": "حداکثر هزینه حساب خدمات بالقوه"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "وارد شده!"
   },
   "smBetaEndedDesc": {
-    "message": "The Secrets Manager Beta ended $BETA_ENDING_DATE$. You have $DAYS$ days left to add Secrets Manager to your paid subscription and maintain access to Secrets Manager data. Contact Customer Success to add Secrets Manager to your subscription.",
+    "message": "بتای مدیر اسرار $BETA_ENDING_DATE$ به پایان رسید. $DAYS$ روز فرصت دارید تا بتا مدیر اسرار را به اشتراک پولی خود اضافه کنید و دسترسی به داده‌های مدیر اسرار را حفظ کنید. برای افزودن مدیر اسرار به اشتراک خود، با پشتیبانی مشتری تماس بگیرید.",
     "placeholders": {
       "beta_ending_date": {
         "content": "$1",
@@ -7164,18 +7246,24 @@
     }
   },
   "betaEnding": {
-    "message": "Beta Ending"
+    "message": "آزمایشی در حال اتمام است"
   },
   "beta": {
-    "message": "Beta"
+    "message": "آزمایشی"
   },
   "baseUrl": {
-    "message": "Server URL"
+    "message": "نشانی اینترنتی سرور"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "دامنه مستعار"
   },
   "alreadyHaveAccount": {
-    "message": "Already have an account?"
+    "message": "پیشتر حساب کاربری داشته اید؟"
+  },
+  "customBillingStart": {
+    "message": "صورتحساب سفارشی منعکس نمی‌شود. بازدید کنید "
+  },
+  "customBillingEnd": {
+    "message": " صفحه برای آخرین صورتحساب"
   }
 }
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index 07e3bb4cc8a..01368eada3e 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Kirjaudu pääsalasanalla"
   },
+  "loginWithPasskey": {
+    "message": "Kirjaudu suojausavaimella"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Käytä generoitua suojausavainta, joka kirjaa sinut automaattisesti sisään ilman salasanaa. Henkilöllisyytesi vahvistetaan kasvojen tunnistuksen tai sormenjäljen kataisille biometrisillä tiedoilla, tai jollakin muulla FIDO2-suojausratkaisulla."
+  },
+  "newPasskey": {
+    "message": "Uusi suojausavain"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Luo lisää salasanattomasta kirjautumisesta"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Syötä pääsalasanasi muokataksesi suojausavaimella kirjautumisen asetuksia."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Suojausavainta luodaan..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Pidä tämä ikkuna avoinna ja seuraa selaimesi opasteita."
+  },
+  "errorCreatingPasskey": {
+    "message": "Virhe suojausavaimen luonnissa"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Suojausavaimesi luonnissa kohdattiin ongelma."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Suojausavain on luotu!"
+  },
+  "customName": {
+    "message": "Mukautettu nimi"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Anna suojausavaimellesi nimi, josta tunnistat sen."
+  },
+  "encryptionNotSupported": {
+    "message": "Salausta ei tueta"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Suojausavaimella kirjautuminen on käytössä"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ tallennettiin",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Suojausavain poistettiin"
+  },
+  "removePasskey": {
+    "message": "POista suojausavain"
+  },
+  "removePasskeyInfo": {
+    "message": "Jos kaikki suojausavaimet poistetaan, et voi kirjautua uusille laitteille ilman pääsalasanaasi."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Suojausavianten enimmäismäärä on saavutettu. Lisää suojausavain poistamalla jokin nykyisistä avaimista."
+  },
+  "tryAgain": {
+    "message": "Yritä uudelleen"
+  },
   "createAccount": {
     "message": "Luo uusi tili"
   },
@@ -1341,7 +1407,7 @@
     }
   },
   "options": {
-    "message": "Asetukset"
+    "message": "Valinnat"
   },
   "preferences": {
     "message": "Asetukset"
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "pakollinen"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$ merkkiä (enimmäismäärä on $MAX$)",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Enintään $MAX$ merkkiä",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Käytössä"
   },
+  "off": {
+    "message": "Ei käytössä"
+  },
   "members": {
     "message": "Jäsenet"
   },
@@ -6591,13 +6673,13 @@
     "message": "Tallenna lisenssi"
   },
   "projectPeopleDescription": {
-    "message": "Myönnä ryhmille tai henkilöille tämän projektin käyttöoikeus."
+    "message": "Myönnä ryhmille tai henkilöille käyttöoikeus projektiin."
   },
   "projectPeopleSelectHint": {
     "message": "Syötä tai valitse henkilöitä tai ryhmiä"
   },
   "projectServiceAccountsDescription": {
-    "message": "Myönnä palvelutileille tämän projektin käyttöoikeus."
+    "message": "Myönnä palvelutileille käyttöoikeus projektiin."
   },
   "projectServiceAccountsSelectHint": {
     "message": "Syötä tai valitse palvelutilit"
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Lisää Salaisuushallinta"
+  "subscribeToSecretsManager": {
+    "message": "Tilaa Salaisuushallinta"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Lisää Salaisuushallinta myös päivitettyyn tilaukseesi, jottet menetä pääsyä aiemmalla tilauksellasi luotuihin salaisuuksiin."
@@ -7164,7 +7246,7 @@
     }
   },
   "betaEnding": {
-    "message": "Beta päättyy"
+    "message": "Beta on päättynyt"
   },
   "beta": {
     "message": "Beta"
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Onko sinulla jo tili?"
+  },
+  "customBillingStart": {
+    "message": "Mukautettu laskutus ei näy. Löydät viimeisimmän laskutuksen "
+  },
+  "customBillingEnd": {
+    "message": " -sivulta."
   }
 }
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index 062195bdaf9..4a238724903 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Mag-log in gamit ang master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Gumawa ng account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "kailangan"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "I-on"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Mga Miyembro"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index aaa39033815..4c08e598cac 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Se connecter avec le mot de passe principal"
   },
+  "loginWithPasskey": {
+    "message": "Se connecter avec la clé d'accès"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Utilisez une clé d'accès générée qui vous connectera automatiquement sans mot de passe. Les fonctions biométriques, comme la reconnaissance faciale, l'empreinte digitale, ou une autre méthode de sécurité FIDO2 vérifiera votre identité."
+  },
+  "newPasskey": {
+    "message": "Nouvelle clé d'accès"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "En savoir plus sur l'identification sans mots de passe"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Entrez votre mot de passe maître pour modifier la connexion avec les paramètres de clé d'accès."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Création de la clé d'accès..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Gardez cette fenêtre ouverte et suivez les instructions de votre navigateur."
+  },
+  "errorCreatingPasskey": {
+    "message": "Erreur de création de la clé d'accès"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Il y a eu un problème lors de la crétion de votre clé d'accès."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Clé d'accès créée avec succès!"
+  },
+  "customName": {
+    "message": "Nom personnalisé"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Nommez votre clé d'accès pour vous aider à l'identifier."
+  },
+  "encryptionNotSupported": {
+    "message": "Chiffrement non pris en charge"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Se connecter avec la clé d'accès activée"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ a été enregistrée",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Clé d'accès supprimée"
+  },
+  "removePasskey": {
+    "message": "Supprimer la clé d'accès"
+  },
+  "removePasskeyInfo": {
+    "message": "Si toutes les clés d'accès sont supprimées, vous ne pourrez pas vous connecter à de nouveaux appareils sans votre mot de passe principal."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Limite de clé d'accès atteinte. Supprimez une clé d'accès pour en ajouter une autre."
+  },
+  "tryAgain": {
+    "message": "Essayez de nouveau"
+  },
   "createAccount": {
     "message": "Créez un compte"
   },
@@ -2535,7 +2601,7 @@
     "message": "L’identifiant externe peut être utilisé comme référence ou pour lier cette ressource à un système externe tel qu’un répertoire utilisateur."
   },
   "nestCollectionUnder": {
-    "message": "Collection imbriquée dessous"
+    "message": "Collection imbriquée sous"
   },
   "accessControl": {
     "message": "Contrôle d’accès"
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "requis"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ caractères maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ caractères maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Activé"
   },
+  "off": {
+    "message": "Désactivée"
+  },
   "members": {
     "message": "Membres"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Ajouter Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "S'abonner au Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Ajoutez Secrets Manager à votre plan mis à niveau pour conserver l'accès à tous les secrets créés avec votre plan précédent."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Vous avez déjà un compte ?"
+  },
+  "customBillingStart": {
+    "message": "La facturation personnalisée n'apparaît pas. Visitez la page "
+  },
+  "customBillingEnd": {
+    "message": " pour la dernière facturation."
   }
 }
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index 7fe4fe66a9b..9125060f521 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "צור חשבון"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 9764f7d39da..078fba139f2 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "खाता बनाएँ"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 1911a71a36e..0684cdb4a5a 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Prijava glavnom lozinkom"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Stvori račun"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obavezno"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "najviše $MAX$ znakova",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Uključeno"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Članovi"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Već imaš račun?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index 51ded2ab77c..d24afc3cce0 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Bejelentkezés mesterjelszóval"
   },
+  "loginWithPasskey": {
+    "message": "Bejelentkezés jelszóval"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Használjunk generált jelszót, amely automatikusan, jelszó nélkül bejelentkeztet. A biometrikus adatok, például az arcfelismerés vagy az ujjlenyomat, vagy más FIDO2 biztonsági módszer igazolja személyazonosságot."
+  },
+  "newPasskey": {
+    "message": "Új jelszó"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "További információ a jelszó nélküli használatról"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Adjuk meg a mesterjelszót a belépési jelszó beállításainak módosításához."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Jelszó létrehozása..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Tartsuk nyitva ezt az ablakot és kövessük a böngésző utasításait."
+  },
+  "errorCreatingPasskey": {
+    "message": "Hiba történt a jelszó létrehozásakor."
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Probléma merült fel a jelszó létrehozásakor."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "A jelszó sikeresen létrehozásra került!"
+  },
+  "customName": {
+    "message": "Egyedi név"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Nevezzük el a jelszót a könnyebb azonosítshoz."
+  },
+  "encryptionNotSupported": {
+    "message": "A titkosítás nem támogatott."
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Jelentkezzünk be bekapcsolt jelszóval"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ mentésre került.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "A jelszó eltávolításra került."
+  },
+  "removePasskey": {
+    "message": "Jelszó eltávolítása"
+  },
+  "removePasskeyInfo": {
+    "message": "Ha az összes jelszót eltávolítjuk, nem tudunk bejelentkezni az új eszközökre a mesterjelszó nélkül."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Elértük a jelszó korlátot. Távolítsunk el egy jelszót egy másik hozzáadásához."
+  },
+  "tryAgain": {
+    "message": "Próbáluk újra"
+  },
   "createAccount": {
     "message": "Fiók létrehozása"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "kötelező"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "Maximálisan $CURRENT$/$MAX$ karakter",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "maximálisan $MAX$ karakter",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Be"
   },
+  "off": {
+    "message": "Ki"
+  },
   "members": {
     "message": "Tagok"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Titkos kódkezelő hozzáadása"
+  "subscribeToSecretsManager": {
+    "message": "Feliratkozás a Titkos kód kezelés szolgáltatásra"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Titkkos kód kezelő hozzáadása a felminősített csomaghoz, hogy az előző csomaggal létrehozott titkos kódok megtartásához."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Van már saját fiók?"
+  },
+  "customBillingStart": {
+    "message": "Az egyedi számlázás nem jelenik meg. Kerssük fel "
+  },
+  "customBillingEnd": {
+    "message": " oldalt a legújabb számlázásért."
   }
 }
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 0932b38ef0a..f5f4c05d888 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Masuk dengan kata sandi utama"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Buat Akun"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "diperlukan"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Anggota"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index 1b58ad965e3..2e2c49876c2 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Accedi con password principale"
   },
+  "loginWithPasskey": {
+    "message": "Accedi con passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Usa una passkey che ti farà accedere automaticamente senza una password. L'autenticazione biometrica, come il riconoscimento facciale o l'impronta digitale, o un altro metodo di sicurezza FIDO2 verificherà la tua identità."
+  },
+  "newPasskey": {
+    "message": "Nuova passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Ulteriori informazioni sull'autenticazione senza password"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Inserisci la tua password principale per modificare le impostazioni di accesso con le passkey."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creando la passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Mantieni questa finestra aperta e segui le istruzioni del tuo browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Errore durante la creazione della passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Si è verificato un problema durante la creazione della tua passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey creata!"
+  },
+  "customName": {
+    "message": "Nome personalizzato"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Dai un nome alla tua passkey per aiutarti a riconoscerla."
+  },
+  "encryptionNotSupported": {
+    "message": "Criptografia non supportata"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Accesso con passkey attivato"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ salvato",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey rimossa"
+  },
+  "removePasskey": {
+    "message": "Rimuovi passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "Se tutte le passkey sono rimosse, non potrai accedere a nuovi dispositivi senza la tua password principale."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Limite di passkey raggiunto. Rimuovi una passkey per aggiungerne un'altra."
+  },
+  "tryAgain": {
+    "message": "Riprova"
+  },
   "createAccount": {
     "message": "Crea account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obbligatorio"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$ caratteri su $MAX$",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Massimo $MAX$ caratteri",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Attivo"
   },
+  "off": {
+    "message": "No"
+  },
   "members": {
     "message": "Membri"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Aggiungi Gestore dei Segreti"
+  "subscribeToSecretsManager": {
+    "message": "Iscriviti al Gestore dei Segreti"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Aggiungi il Gestore dei Segreti al tuo piano aggiornato per mantenere l'accesso a tutti i secret creati con il tuo piano precedente."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Hai già un account?"
+  },
+  "customBillingStart": {
+    "message": "La fatturazione personalizzata non è riflessa. Visita la "
+  },
+  "customBillingEnd": {
+    "message": " pagina per l'ultima fatturazione."
   }
 }
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index efc64056030..c943906d601 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "マスターパスワードでログイン"
   },
+  "loginWithPasskey": {
+    "message": "パスキー でログイン"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "パスワードなしで自動的にログインできる、生成されたパスキーを使用します。顔や指紋などの生体認証、または他の FIDO2 認証方式で本人確認を行います。"
+  },
+  "newPasskey": {
+    "message": "新しいパスキー"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "パスワードレスの詳細"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "パスキー設定でのログインを変更するには、マスターパスワードを入力してください。"
+  },
+  "creatingPasskeyLoading": {
+    "message": "パスキーを作成中..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "このウィンドウを開いたままにして、ブラウザの指示に従ってください。"
+  },
+  "errorCreatingPasskey": {
+    "message": "パスキーの作成に失敗しました"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "パスキー作成中に問題が発生しました。"
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "パスキーを作成しました！"
+  },
+  "customName": {
+    "message": "カスタム名"
+  },
+  "customPasskeyNameInfo": {
+    "message": "パスキーに名前を付けて、識別しやすいようにしましょう。"
+  },
+  "encryptionNotSupported": {
+    "message": "暗号化はサポートされていません"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "パスキーをオンにしてログイン"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ を保存しました",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "パスキーを削除しました"
+  },
+  "removePasskey": {
+    "message": "パスキーを削除"
+  },
+  "removePasskeyInfo": {
+    "message": "すべてのパスキーを削除すると、マスターパスワードなしで新しいデバイスにログインすることはできません。"
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "パスキーの上限に達しました。追加するにはまず既存のパスキーを削除してください。"
+  },
+  "tryAgain": {
+    "message": "再試行"
+  },
   "createAccount": {
     "message": "アカウントの作成"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "必須"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ 文字",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "最大 $MAX$ 文字",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "オン"
   },
+  "off": {
+    "message": "オフ"
+  },
   "members": {
     "message": "メンバー"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "シークレットマネージャーを追加"
+  "subscribeToSecretsManager": {
+    "message": "シークレットマネージャーに登録"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "アップグレードしたプランにシークレットマネージャーを追加して、以前のプランで作成されたシークレットへのアクセスを維持します。"
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "既にアカウントをお持ちですか？"
+  },
+  "customBillingStart": {
+    "message": "カスタム請求は反映されていません。"
+  },
+  "customBillingEnd": {
+    "message": "のページで最新の請求書をご覧いただけます。"
   }
 }
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index 47aa45f2fa1..665c28b3b9c 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "ავტორიზაცია მთავარი პაროლით"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "ანგარიშის შექმნა"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index 8f210948f70..d81d2a49b24 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "ಖಾತೆ ತೆರೆ"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index ddf2a0a702d..66201c33c60 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "마스터 비밀번호로 로그인"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "계정 만들기"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "구성원"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 5f41e5c7ede..30ea169447a 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Pieteikties ar galveno paroli"
   },
+  "loginWithPasskey": {
+    "message": "Pieteikties ar piekļuves atslēgu"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Piekļuves atslēga ir izmantojama, lai automātiski pieteiktos bez paroles. Biometrija, piemēram, sejas atpazīšana vai pirkstu nospiedums, vai cits FIDO2 drošības veids apstiprinās identitāti."
+  },
+  "newPasskey": {
+    "message": "Jauna piekļuves atslēga"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Uzzināt vairāk par bezparoles pieteikšanos"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Jāievada galvenā parole, lai mainītu pieteikšanās ar piekļuves atslēgu iestatījumus."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Izveido piekļuves atslēgu..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Šis logs ir jāpatur atvērts un jāseko uzvednēm pārlūkā."
+  },
+  "errorCreatingPasskey": {
+    "message": "Kļūda piekļuves atslēgas izveidošanā"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Atgadījās kļūda piekļuves atslēgas izveidošanas laikā."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Piekļuves atslēga veiksmīģi izveidota."
+  },
+  "customName": {
+    "message": "Pielāgots nosaukums"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Nosaukuma piešķiršana piekļuves atslēgai palīdz to atpazīt."
+  },
+  "encryptionNotSupported": {
+    "message": "Šifrēšana nav atbalstīta"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Pieteikšanās ar piekūves atslēgu ieslēgta"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saglabāta",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Piekļuves atslēga noņemta"
+  },
+  "removePasskey": {
+    "message": "Noņemt piekļuves atslēgu"
+  },
+  "removePasskeyInfo": {
+    "message": "Ja visas piekļuves atslēgas ir noņemtas, nebūs iespējams pieteikties jaunās ierīcēs bez galvenās paroles."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Sasniegts piekļuves atslēgu ierobežojums. Jānoņem kāda piekļuves atslēga, lai pievienotu citu."
+  },
+  "tryAgain": {
+    "message": "Jāmēģina vēlreiz"
+  },
   "createAccount": {
     "message": "Izveidot kontu"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "nepieciešams"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ rakstzīmes",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Ne vairāk kā $MAX$ rakstzīmju",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Ieslēgts"
   },
+  "off": {
+    "message": "Izslēgts"
+  },
   "members": {
     "message": "Dalībnieki"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Pievienot Noslēpumu pārvaldnieku"
+  "subscribeToSecretsManager": {
+    "message": "Abonēt Noslēpumu pārvaldnieku"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Noslēpumu pārvaldnieks jāpievieno uzlabotajam plānam, lai saglabātu piekļuvi visiem noslēpumiem, kas tika izveidoti iepriekšējā plānā."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Jau ir konts?"
+  },
+  "customBillingStart": {
+    "message": "Pielāgotie norēķini nav atspoguļoti. Jāapmeklē "
+  },
+  "customBillingEnd": {
+    "message": " sadaļu, lai gūtu ieskatu par jaunākajiem rēķiniem."
   }
 }
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 8d6832cb9a8..e39f2f762d9 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "അക്കൗണ്ട് സൃഷ്ടിക്കുക"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index c24948cacaa..9e0b6004513 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Logg på med hovedpassord"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Opprett en konto"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obligatorisk"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maksimalt $MAX$ tegn",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "På"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Medlemmer"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index da1681c73aa..4efbf528cf0 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index a0eb8b17d09..66bf305406c 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Inloggen met je hoofdwachtwoord"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Account aanmaken"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "vereist"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Maximaal $MAX$ tekens",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Aan"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Leden"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Secrets Manager toevoegen"
+  "subscribeToSecretsManager": {
+    "message": "Abonneren op Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Secrets Manager toevoegen aan je geüpgraded abonnement zodat je toegang houdt tot geheimen die met je vorige abonnement zijn aangemaakt."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Aangepaste facturering is niet weergeven. Bezoek de "
+  },
+  "customBillingEnd": {
+    "message": " pagina voor laatste facturering."
   }
 }
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 6de911d6782..fa222d061d9 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index b21b83ffdb7..ee8c1307e09 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Logowanie hasłem głównym"
   },
+  "loginWithPasskey": {
+    "message": "Zaloguj się za pomocą passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Użyj wygenerowanego passkey'a, który automatycznie zaloguje Cię bez hasła. Biometrie, takie jak rozpoznawanie twarzy lub odcisk palca, lub inna metoda zabezpieczeń FIDO2, zweryfikują Twoją tożsamość."
+  },
+  "newPasskey": {
+    "message": "Nowy passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Dowiedz się więcej o rozwiązaniach bezhasłowych"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Wprowadź hasło główne, aby zmodyfikować ustawienia logowania za pomocą passkey."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Tworzenie passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Pozostaw to okno otwarte i postępuj zgodnie z instrukcjami z przeglądarki."
+  },
+  "errorCreatingPasskey": {
+    "message": "Błąd podczas tworzenia passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Podczas tworzenia passkey'a pojawił się problem."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Pomyślnie utworzono passkey!"
+  },
+  "customName": {
+    "message": "Niestandardowa nazwa"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Nazwij swój passkey, aby pomóc Ci go zidentyfikować."
+  },
+  "encryptionNotSupported": {
+    "message": "Szyfrowanie nie jest obsługiwane"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Logowanie za pomocą passkey zostało włączone"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ zapisany",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey został usunięty"
+  },
+  "removePasskey": {
+    "message": "Usuń passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "Jeśli wszystkie passkey'e zostaną usunięte, nie będziesz mógł zalogować się na nowe urządzenia bez hasła głównego."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Osiągnięto limit passkey'ów. Usuń passkey, aby dodać inny."
+  },
+  "tryAgain": {
+    "message": "Spróbuj ponownie"
+  },
   "createAccount": {
     "message": "Utwórz konto"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "wymagane"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ znaków",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ znaków maksymalnie",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Wł."
   },
+  "off": {
+    "message": "Wyłączone"
+  },
   "members": {
     "message": "Użytkownicy"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Dodaj menedżera sekretów"
+  "subscribeToSecretsManager": {
+    "message": "Zasubskrybuj się do menedżera sekretów"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Dodaj menedżera sekretów do zaktualizowanego planu, aby zachować dostęp do wszelkich sekretów utworzonych w poprzednim planie."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Masz już konto?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index 5da497922a6..b35f957ab61 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Entrar com senha mestra"
   },
+  "loginWithPasskey": {
+    "message": "Iniciar sessão com a chave de acesso"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use uma senha gerada que fará o login automaticamente sem uma senha. Biometrias como reconhecimento facial ou impressão digital, ou outro método de segurança FIDO2 verificarão sua identidade."
+  },
+  "newPasskey": {
+    "message": "Nova chave de acesso"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Saiba mais sobre acesso sem senha"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Digite sua senha mestra para modificar as configurações de login com chave de acesso."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Criando chave de acesso..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Mantenha esta janela aberta e siga as instruções do seu navegador."
+  },
+  "errorCreatingPasskey": {
+    "message": "Erro ao criar chave de acesso"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Houve um problema ao criar sua chave de acesso."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Chave de acesso criada com sucesso!"
+  },
+  "customName": {
+    "message": "Nome personalizado"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Nomeie sua chave de acesso para ajudá-lo a identificá-la."
+  },
+  "encryptionNotSupported": {
+    "message": "Criptografia não suportada"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Iniciar sessão com a chave de acesso ativada"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ salvo",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Chave de acesso removida"
+  },
+  "removePasskey": {
+    "message": "Remover chave de acesso"
+  },
+  "removePasskeyInfo": {
+    "message": "Se todas as chaves de acesso forem removidas, não será mais possível fazer login em novos dispositivos sem sua senha mestra."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Limite de chaves de acesso atingido. Remova uma chave de acesso para adicionar outra."
+  },
+  "tryAgain": {
+    "message": "Tente Novamente"
+  },
   "createAccount": {
     "message": "Criar conta"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obrigatório"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ caracteres no máximo",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "máximo de $MAX$ caracteres",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Ligado"
   },
+  "off": {
+    "message": "Desligado"
+  },
   "members": {
     "message": "Membros"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Assine o Gerenciador de Segredos"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Já tem uma conta?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index 38627692658..52db80b2a0c 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Iniciar sessão com a palavra-passe mestra"
   },
+  "loginWithPasskey": {
+    "message": "Iniciar sessão com a chave de acesso"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Utilize uma chave de acesso gerada que lhe permitirá iniciar sessão automaticamente sem uma palavra-passe. A biometria, como o reconhecimento facial ou a impressão digital ou outro método de segurança FIDO2, verificará a sua identidade."
+  },
+  "newPasskey": {
+    "message": "Nova chave de acesso"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Saiba mais sobre a ausência de palavra-passe"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Introduza a sua palavra-passe mestra para modificar as definições de início de sessão com chave de acesso."
+  },
+  "creatingPasskeyLoading": {
+    "message": "A criar chave de acesso..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Mantenha esta janela aberta e siga as indicações do seu navegador."
+  },
+  "errorCreatingPasskey": {
+    "message": "Erro ao criar chave de acesso"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Houve um problema ao criar a sua chave de acesso."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Chave de acesso criada com sucesso!"
+  },
+  "customName": {
+    "message": "Nome personalizado"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Dê um nome à sua chave de acesso para o ajudar a identificá-la."
+  },
+  "encryptionNotSupported": {
+    "message": "Encriptação não suportada"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Iniciar sessão com a chave de acesso ativada"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ guardada",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Chave de acesso removida"
+  },
+  "removePasskey": {
+    "message": "Remover chave de acesso"
+  },
+  "removePasskeyInfo": {
+    "message": "Se todas as chaves de acesso forem removidas, não será possível iniciar sessão em novos dispositivos sem a sua palavra-passe mestra."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "O limite de chaves de acesso foi atingido. Remova uma chave de acesso para adicionar outra."
+  },
+  "tryAgain": {
+    "message": "Tentar novamente"
+  },
   "createAccount": {
     "message": "Criar conta"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "necessário"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ máximo de caracteres",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Máximo de $MAX$ caracteres",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Ligado"
   },
+  "off": {
+    "message": "Desligado"
+  },
   "members": {
     "message": "Membros"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Adicionar Gestor de Segredos"
+  "subscribeToSecretsManager": {
+    "message": "Subscrever o Gestor de Segredos"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Adicione o Gestor de Segredos ao seu plano atualizado para manter o acesso a quaisquer segredos criados com o seu plano anterior."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Já tem uma conta?"
+  },
+  "customBillingStart": {
+    "message": "A faturação personalizada não é refletida. Visite a "
+  },
+  "customBillingEnd": {
+    "message": " página para a faturação mais recente."
   }
 }
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 8de54c1494b..9ca18d07767 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Autentificați-vă cu parola principală"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Creare cont"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "necesar"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Pornit"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 3feac542568..b209a6c4d11 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Войти с мастер-паролем"
   },
+  "loginWithPasskey": {
+    "message": "Войти с ключом доступа"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Используйте сгенерированный ключ доступа для автоматической авторизации без пароля. Ваша личность будет подтверждена биометрическими данными (распознаванием лица, отпечатком пальца или другим методом безопасности FIDO2)."
+  },
+  "newPasskey": {
+    "message": "Новый ключ доступа"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Подробнее о беспарольном режиме"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Для изменения параметров авторизации ключом доступа введите мастер-пароль."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Создание ключа доступа..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Не закрывайте это окно и следуйте запросам браузера."
+  },
+  "errorCreatingPasskey": {
+    "message": "Ошибка создания ключа доступа"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "При создании ключа доступа возникла проблема."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Ключ доступа успешно создан!"
+  },
+  "customName": {
+    "message": "Имя"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Назовите ключ доступа так, чтобы вы могли его идентифицировать."
+  },
+  "encryptionNotSupported": {
+    "message": "Шифрование не поддерживается"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Авторизоваться с помощью ключа доступа"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ сохранен",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Ключ доступа удален"
+  },
+  "removePasskey": {
+    "message": "Удалить ключ доступа"
+  },
+  "removePasskeyInfo": {
+    "message": "Если будут удалены все ключи доступа, вы не сможете авторизоваться на новых устройствах без мастер-пароля."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Достигнут предел ключей доступа. Удалите какой-нибудь ключ, чтобы добавить другой."
+  },
+  "tryAgain": {
+    "message": "Попробуйте снова"
+  },
   "createAccount": {
     "message": "Создать аккаунт"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "обязательно"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ симв. максимум",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Максимум символов $MAX$",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Вкл"
   },
+  "off": {
+    "message": "Выкл"
+  },
   "members": {
     "message": "Участники"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Добавить Менеджер секретов"
+  "subscribeToSecretsManager": {
+    "message": "Подписаться на Менеджер секретов"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Добавить Менеджер секретов к этому тарифному плану, чтобы сохранить доступ к секретам, созданным ранее."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Уже зарегистрированы?"
+  },
+  "customBillingStart": {
+    "message": "Пользовательские счета не отображаются. Посетите страницу "
+  },
+  "customBillingEnd": {
+    "message": " для получения последней информации о выставлении счетов."
   }
 }
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index be9cbdaff31..1d8367d6114 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "ගිණුමක් සාදන්න"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index 56752c2ddb6..89d5995a995 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Prihlásenie pomocou hlavného hesla"
   },
+  "loginWithPasskey": {
+    "message": "Prihlásiť sa s prístupovým kľúčom"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Použite vygenerovaný prístupový kľúč, ktorý vás automaticky prihlási bez zadávania hesla. Vaša identita bude overená pomocou biometrie, ako napríklad rozpoznanie tváre alebo odtlačok prsta, alebo pomocou ďalšej FIDO2 bezpečnostnej metódy."
+  },
+  "newPasskey": {
+    "message": "Nový prístupový kľúč"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Dozvedieť sa viac o automatickom prihlasovaní"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Zadajte vaše hlavné heslo ak chcete zmeniť nastavenia prihlásenia s prístupovým kľúčom."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Vytvára sa prístupový kľúč..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Ponechajte toto okno otvorené a nasledujte pokyny vášho prehliadača."
+  },
+  "errorCreatingPasskey": {
+    "message": "Chyba pri vytváraní prístupového kľúča"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Nastal problém pri vytváraní vášho prístupového kľúča."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Prístupový kľúč bol úspešne vytvorený!"
+  },
+  "customName": {
+    "message": "Vlastný názov"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Dajte prístupovému kľúču názov aby ste ho mohli ľahšie identifikovať."
+  },
+  "encryptionNotSupported": {
+    "message": "Šifrovanie nie je podporované"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Prihlásenie s prístupovým kľúčom zapnuté"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ uložený",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Prístupový kľúč bol odstránený"
+  },
+  "removePasskey": {
+    "message": "Odstrániť prístupový kľúč"
+  },
+  "removePasskeyInfo": {
+    "message": "Ak odstránite všetky prístupové kľúče, bez hlavného hesla sa nebudete môcť prihlásiť na nových zariadeniach."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Dosiahnutý limit počtu prístupových kľúčov. Odstráňte prístupový kľuč, ak chcete pridať ďalší."
+  },
+  "tryAgain": {
+    "message": "Skúsiť znova"
+  },
   "createAccount": {
     "message": "Vytvoriť účet"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "povinné"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ maximálneho počtu znakov",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "maximálne $MAX$ znakov",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Zapnuté"
   },
+  "off": {
+    "message": "Vypnuté"
+  },
   "members": {
     "message": "Členovia"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Pridať Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Predplatiť Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Do aktualizovaného plánu pridajte Secret Manager, aby ste si zachovali prístup k všetkým tajomstvám vytvoreným v predchádzajúcom pláne."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Už máte účet?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index 62dda84d524..d082c126e7e 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Prijava z glavnim geslom"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Ustvarite si račun"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obvezno"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index f037202a975..2fad2224356 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Пријавите се са главном лозинком"
   },
+  "loginWithPasskey": {
+    "message": "Пријави се са passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Користите генерисан passkey који ће вас аутоматски пријавити без лозинке. Биометрија, као што је препознавање лица или отисак прста, или неки други FIDO2 метод за проверу идентитета."
+  },
+  "newPasskey": {
+    "message": "Нов passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Сазнајте више о пријављивању без лозинке"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Унесите главну лозинку да бисте изменили подешавања пријављивања са passkey."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Креација passkey-а..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Држите овај прозор отворен и пратите упутства из прегледача."
+  },
+  "errorCreatingPasskey": {
+    "message": "Грешки у креацији passkey-а"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Дошло је до проблема приликом креирања вашег passkey-а."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey успешно креиран!"
+  },
+  "customName": {
+    "message": "Прилагоди име"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Именујте Ваш passkey за лакшу идентификацију."
+  },
+  "encryptionNotSupported": {
+    "message": "Шифровање није подржано"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Пријављивање са passkey је упаљено"
+  },
+  "passkeySaved": {
+    "message": "„$NAME$“ сачувано",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey уклоњен"
+  },
+  "removePasskey": {
+    "message": "Уклонити passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "Ако су сви passkey уклоњени, нећете моћи да се пријавите на нове уређаје без ваше главне лозинке."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Достугнут лимит Passkey-а. Уклонити један да би додали други."
+  },
+  "tryAgain": {
+    "message": "Покушај поново"
+  },
   "createAccount": {
     "message": "Креирај налог"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "обавезно"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$ од макс $MAX$ карактера",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Максимум $MAX$ карактера",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Укључено"
   },
+  "off": {
+    "message": "Искључено"
+  },
   "members": {
     "message": "Чланови"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Додати Менаџер Тајни"
+  "subscribeToSecretsManager": {
+    "message": "Пријави се на Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7170,12 +7252,18 @@
     "message": "Бета"
   },
   "baseUrl": {
-    "message": "Server URL"
+    "message": "УРЛ Сервера"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Домен алијаса"
   },
   "alreadyHaveAccount": {
     "message": "Већ имате налог?"
+  },
+  "customBillingStart": {
+    "message": "Прилагођени обрачун се не одражава. Посетите "
+  },
+  "customBillingEnd": {
+    "message": " страницу за најновије фактуре."
   }
 }
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index 95a8c7fd421..47e86ccb131 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Napravi Nalog"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 253bee8631e..9940c818b90 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Logga in med huvudlösenord"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Anpassat namn"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Försök igen"
+  },
   "createAccount": {
     "message": "Skapa konto"
   },
@@ -1261,7 +1327,7 @@
     "message": "Data har importerats till ditt valv"
   },
   "importSuccessNumberOfItems": {
-    "message": "A total of $AMOUNT$ items were imported.",
+    "message": "Sammanlagt $AMOUNT$ objekt importerades.",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "obligatoriskt"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Max $MAX$ tecken",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "På"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Medlemmar"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Lägg till Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Har du redan ett konto?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index f620a91ec72..28b3af6c2d5 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Log in with master password"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Create account"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index 593169a336c..f2b7fce7408 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "เข้าสู่ระบบด้วยรหัสผ่านหลัก"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "สร้างบัญชีผู้ใช้"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index 25285f2c317..7561db89d67 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Ana parola ile giriş yap"
   },
+  "loginWithPasskey": {
+    "message": "Şifreyle giriş yapın"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Parola olmadan otomatik olarak oturum açmanızı sağlayacak oluşturulmuş bir geçiş anahtarı kullanın. Yüz tanıma veya parmak izi gibi biyometri veya başka bir FIDO2 güvenlik yöntemi kimliğinizi doğrulayacaktır."
+  },
+  "newPasskey": {
+    "message": "Yeni şifre"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Şifre anahtarıyla oturum açma ayarlarını değiştirmek için ana şifrenizi girin."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Bu pencereyi açık tutun ve tarayıcınızdan gelen talimatları izleyin."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Şifreniz oluşturulurken bir sorun oluştu."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ kaydedildi",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Hesap aç"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "zorunlu"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "en fazla $MAX$ karakter",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Açık"
   },
+  "off": {
+    "message": "Kapalı"
+  },
   "members": {
     "message": "Üyeler"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Secrets Manager'a abone olun"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Zaten hesabınız var mı?"
+  },
+  "customBillingStart": {
+    "message": "Özel faturalandırma yansıtılmıyor. Son fatura sayfasını "
+  },
+  "customBillingEnd": {
+    "message": " ziyaret edin."
   }
 }
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index deb7f18773b..878063b9bee 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Увійти з головним паролем"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Створити обліковий запис"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "обов'язково"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "Максимум $MAX$ символів",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "Увімкнено"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Учасники"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Додати менеджер секретів"
+  "subscribeToSecretsManager": {
+    "message": "Передплатити менеджер секретів"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Додайте менеджер секретів до свого оновленого плану, щоб підтримувати доступ до будь-яких секретів, створених у вашому минулому плані."
@@ -7170,12 +7252,18 @@
     "message": "Бета"
   },
   "baseUrl": {
-    "message": "Server URL"
+    "message": "URL-адреса сервера"
   },
   "aliasDomain": {
-    "message": "Alias domain"
+    "message": "Псевдонім домену"
   },
   "alreadyHaveAccount": {
     "message": "Вже маєте обліковий запис?"
+  },
+  "customBillingStart": {
+    "message": "Власний рахунок не відображений. Відвідайте "
+  },
+  "customBillingEnd": {
+    "message": " для отримання останнього рахунку."
   }
 }
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 96eef230907..c8d4017e30d 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "Đăng nhập bằng mật khẩu chính"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "Tạo tài khoản"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "required"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ ký tự tối đa",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "On"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "Members"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "Add Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index af2cb944862..daee6752f5f 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -603,13 +603,79 @@
     "message": "登录或者创建一个账户来访问您的安全密码库。"
   },
   "loginWithDevice": {
-    "message": "设备登录"
+    "message": "使用设备登录"
   },
   "loginWithDeviceEnabledNote": {
     "message": "设备登录必须在 Bitwarden 应用程序的设置中启用。需要其他登录选项吗？"
   },
   "loginWithMasterPassword": {
-    "message": "主密码登录"
+    "message": "使用主密码登录"
+  },
+  "loginWithPasskey": {
+    "message": "使用通行密钥登录"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "使用已生成的通行密钥，无需密码即可自动登录。生物识别技术（例如面部识别或指纹）或其他 FIDO2 安全方法将用于验证您的身份。"
+  },
+  "newPasskey": {
+    "message": "新增通行密钥"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "了解更多关于无密码登录的信息"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "输入您的主密码以修改通行密钥登录设置。"
+  },
+  "creatingPasskeyLoading": {
+    "message": "正在创建通行密钥..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "保持此窗口打开然后按照浏览器的提示操作。"
+  },
+  "errorCreatingPasskey": {
+    "message": "创建通行密钥时出错"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "创建通行密钥时出现问题。"
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "通行密钥创建成功！"
+  },
+  "customName": {
+    "message": "自定义名称"
+  },
+  "customPasskeyNameInfo": {
+    "message": "为您的通行密钥命名以帮助您识别它。"
+  },
+  "encryptionNotSupported": {
+    "message": "不支持加密"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "已启用通行密钥登录"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ 已保存",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "通行密钥已移除"
+  },
+  "removePasskey": {
+    "message": "移除通行密钥"
+  },
+  "removePasskeyInfo": {
+    "message": "如果移除了所有通行密钥，没有主密码您将无法登录新的设备。"
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "通行密钥已达上限。移除一个通行密钥以添加另一个。"
+  },
+  "tryAgain": {
+    "message": "再试一次"
   },
   "createAccount": {
     "message": "创建账户"
@@ -785,7 +851,7 @@
     }
   },
   "enterVerificationCodeApp": {
-    "message": "请输入验证器应用程序中的 6 位验证码。"
+    "message": "请输入您的验证器应用中的 6 位数验证码。"
   },
   "enterVerificationCodeEmail": {
     "message": "请输入发送给电子邮件 $EMAIL$ 的 6 位数验证码。",
@@ -1519,7 +1585,7 @@
     "message": "密钥"
   },
   "twoStepAuthenticatorEnterCode": {
-    "message": "输入应用程序中的 6 位验证码"
+    "message": "输入应用程序中的 6 位数验证码"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "如果您要把它添加到另一个设备，下面是您的验证器应用所需要的二维码（或密钥）。"
@@ -1615,7 +1681,7 @@
     "message": "输入您希望接收验证码的电子邮件"
   },
   "twoFactorEmailEnterCode": {
-    "message": "输入电子邮件中的 6 位验证码"
+    "message": "输入电子邮件中的 6 位数验证码"
   },
   "sendEmail": {
     "message": "发送电子邮件"
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "必填"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$ / 最大字符数 $MAX$",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "最多 $MAX$ 个字符",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "开启"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "成员"
   },
@@ -5913,7 +5995,7 @@
     "description": "A machine user which can be used to automate processes and access secrets in the system."
   },
   "serviceAccounts": {
-    "message": "服务帐户",
+    "message": "服务账户",
     "description": "The title for the section that deals with service accounts."
   },
   "secrets": {
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "添加机密管理器"
+  "subscribeToSecretsManager": {
+    "message": "订阅机密管理器"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "将机密管理器添加到升级后的计划中，以保留对使用之前的计划创建的所有机密的访问权限。"
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "已经有一个账户？"
+  },
+  "customBillingStart": {
+    "message": "未返回自定义费用记录。请访问 "
+  },
+  "customBillingEnd": {
+    "message": " 页面获取最新的账单。"
   }
 }
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index 192212eff19..cb040a728dc 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -611,6 +611,72 @@
   "loginWithMasterPassword": {
     "message": "使用主密碼登入"
   },
+  "loginWithPasskey": {
+    "message": "Log in with passkey"
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+  },
+  "newPasskey": {
+    "message": "New passkey"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Learn more about passwordless"
+  },
+  "passkeyEnterMasterPassword": {
+    "message": "Enter your master password to modify log in with passkey settings."
+  },
+  "creatingPasskeyLoading": {
+    "message": "Creating passkey..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Keep this window open and follow prompts from your browser."
+  },
+  "errorCreatingPasskey": {
+    "message": "Error creating passkey"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "There was a problem creating your passkey."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Passkey successfully created!"
+  },
+  "customName": {
+    "message": "Custom name"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Name your passkey to help you identify it."
+  },
+  "encryptionNotSupported": {
+    "message": "Encryption not supported"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
+  "passkeySaved": {
+    "message": "$NAME$ saved",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Passkey removed"
+  },
+  "removePasskey": {
+    "message": "Remove passkey"
+  },
+  "removePasskeyInfo": {
+    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Passkey limit reached. Remove a passkey to add another."
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
   "createAccount": {
     "message": "建立帳戶"
   },
@@ -5406,6 +5472,19 @@
   "required": {
     "message": "必填"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$/$MAX$ character maximum",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
   "characterMaximum": {
     "message": "$MAX$ character maximum",
     "placeholders": {
@@ -5754,6 +5833,9 @@
   "on": {
     "message": "開啟"
   },
+  "off": {
+    "message": "Off"
+  },
   "members": {
     "message": "成員"
   },
@@ -7096,8 +7178,8 @@
       }
     }
   },
-  "addSecretsManager": {
-    "message": "新增 Secrets Manager"
+  "subscribeToSecretsManager": {
+    "message": "Subscribe to Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
     "message": "將 Secrets Manager 加入您的升級方案，來記錄維持存取於先前方案中保存的秘密資訊。"
@@ -7177,5 +7259,11 @@
   },
   "alreadyHaveAccount": {
     "message": "已經有帳戶？"
+  },
+  "customBillingStart": {
+    "message": "Custom billing is not reflected. Visit the "
+  },
+  "customBillingEnd": {
+    "message": " page for latest invoicing."
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
index 01cbc3c0bc5..0fa39f2f292 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
@@ -1,47 +1,25 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="addTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h2 class="modal-title" id="addTitle">
-          {{ "addExistingOrganization" | i18n }}
-        </h2>
-        <button
-          type="button"
-          class="close"
-          data-dismiss="modal"
-          appA11yTitle="{{ 'close' | i18n }}"
-        >
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <div class="card-body text-center" *ngIf="loading">
-          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-          {{ "loading" | i18n }}
-        </div>
-        <ng-container *ngIf="!loading">
-          <table class="table table-hover table-list">
-            <tr *ngFor="let o of organizations">
-              <td width="30">
-                <bit-avatar [text]="o.name" [id]="o.id" size="small"></bit-avatar>
-              </td>
-              <td>
-                {{ o.name }}
-              </td>
-              <td>
-                <button
-                  type="button"
-                  class="btn btn-outline-secondary pull-right"
-                  (click)="add(o)"
-                  [disabled]="formPromise"
-                >
-                  Add
-                </button>
-              </td>
-            </tr>
-          </table>
-        </ng-container>
-      </div>
-    </div>
-  </div>
-</div>
+<bit-dialog [loading]="loading">
+  <span bitDialogTitle>{{ "addExistingOrganization" | i18n }}</span>
+  <ng-container bitDialogContent>
+    <bit-table>
+      <ng-template body>
+        <tr bitRow *ngFor="let o of data.organizations">
+          <td bitCell width="30">
+            <bit-avatar [text]="o.name" [id]="o.id" size="small"></bit-avatar>
+          </td>
+          <td bitCell>
+            {{ o.name }}
+          </td>
+          <td bitCell>
+            <button type="button" bitButton [bitAction]="add(o)" class="tw-float-right">Add</button>
+          </td>
+        </tr>
+      </ng-template>
+    </bit-table>
+  </ng-container>
+  <ng-container bitDialogFooter>
+    <button type="button" bitButton bitDialogClose>
+      {{ "close" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
index d3eff4bc53c..0d61c264e29 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
@@ -1,4 +1,5 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { DIALOG_DATA, DialogRef } from "@angular/cdk/dialog";
+import { Component, Inject, OnInit } from "@angular/core";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -10,20 +11,21 @@ import { DialogService } from "@bitwarden/components";
 
 import { WebProviderService } from "../services/web-provider.service";
 
+interface AddOrganizationDialogData {
+  providerId: string;
+  organizations: Organization[];
+}
+
 @Component({
-  selector: "provider-add-organization",
   templateUrl: "add-organization.component.html",
 })
 export class AddOrganizationComponent implements OnInit {
-  @Input() providerId: string;
-  @Input() organizations: Organization[];
-  @Output() onAddedOrganization = new EventEmitter();
-
-  provider: Provider;
-  formPromise: Promise<any>;
-  loading = true;
+  protected provider: Provider;
+  protected loading = true;
 
   constructor(
+    private dialogRef: DialogRef,
+    @Inject(DIALOG_DATA) protected data: AddOrganizationDialogData,
     private providerService: ProviderService,
     private webProviderService: WebProviderService,
     private i18nService: I18nService,
@@ -37,52 +39,53 @@ export class AddOrganizationComponent implements OnInit {
   }
 
   async load() {
-    if (this.providerId == null) {
+    if (this.data.providerId == null) {
       return;
     }
 
-    this.provider = await this.providerService.get(this.providerId);
+    this.provider = await this.providerService.get(this.data.providerId);
 
     this.loading = false;
   }
 
-  async add(organization: Organization) {
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    if (this.formPromise) {
-      return;
-    }
+  add(organization: Organization) {
+    return async () => {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: organization.name,
+        content: {
+          key: "addOrganizationConfirmation",
+          placeholders: [organization.name, this.provider.name],
+        },
+        type: "warning",
+      });
 
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: organization.name,
-      content: {
-        key: "addOrganizationConfirmation",
-        placeholders: [organization.name, this.provider.name],
-      },
-      type: "warning",
-    });
+      if (!confirmed) {
+        return false;
+      }
 
-    if (!confirmed) {
-      return false;
-    }
+      try {
+        await this.webProviderService.addOrganizationToProvider(
+          this.data.providerId,
+          organization.id
+        );
+      } catch (e) {
+        this.validationService.showError(e);
+        return;
+      }
 
-    try {
-      this.formPromise = this.webProviderService.addOrganizationToProvider(
-        this.providerId,
-        organization.id
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("organizationJoinedProvider")
       );
-      await this.formPromise;
-    } catch (e) {
-      this.validationService.showError(e);
-      return;
-    } finally {
-      this.formPromise = null;
-    }
 
-    this.platformUtilsService.showToast(
-      "success",
-      null,
-      this.i18nService.t("organizationJoinedProvider")
-    );
-    this.onAddedOrganization.emit();
+      this.dialogRef.close(true);
+    };
+  }
+
+  static open(dialogService: DialogService, data: AddOrganizationDialogData) {
+    return dialogService.open<boolean, AddOrganizationDialogData>(AddOrganizationComponent, {
+      data,
+    });
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
index 59d07f7def8..9e3aaf4d29e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
@@ -97,5 +97,3 @@
     </table>
   </ng-container>
 </ng-container>
-
-<ng-template #add></ng-template>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
index 329bf5189e7..758c8120353 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
@@ -1,5 +1,6 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
+import { firstValueFrom } from "rxjs";
 import { first } from "rxjs/operators";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
@@ -33,8 +34,6 @@ const DisallowedPlanTypes = [
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class ClientsComponent implements OnInit {
-  @ViewChild("add", { read: ViewContainerRef, static: true }) addModalRef: ViewContainerRef;
-
   providerId: string;
   searchText: string;
   addableOrganizations: Organization[];
@@ -135,23 +134,14 @@ export class ClientsComponent implements OnInit {
   }
 
   async addExistingOrganization() {
-    const [modal] = await this.modalService.openViewRef(
-      AddOrganizationComponent,
-      this.addModalRef,
-      (comp) => {
-        comp.providerId = this.providerId;
-        comp.organizations = this.addableOrganizations;
-        // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-        comp.onAddedOrganization.subscribe(async () => {
-          try {
-            await this.load();
-            modal.close();
-          } catch (e) {
-            this.logService.error(`Handled exception: ${e}`);
-          }
-        });
-      }
-    );
+    const dialogRef = AddOrganizationComponent.open(this.dialogService, {
+      providerId: this.providerId,
+      organizations: this.addableOrganizations,
+    });
+
+    if (await firstValueFrom(dialogRef.closed)) {
+      await this.load();
+    }
   }
 
   async remove(organization: ProviderOrganizationOrganizationDetailsResponse) {
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
index 53137514d4d..994980deeea 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
-import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 
 @Component({
   selector: "app-create-organization",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
index 70bc6241b6f..7995e14825f 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
@@ -1,10 +1,10 @@
 import { CommonModule } from "@angular/common";
-import { ComponentFactoryResolver, NgModule } from "@angular/core";
+import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { SearchModule } from "@bitwarden/components";
+import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 import { OssModule } from "@bitwarden/web-vault/app/oss.module";
 
 import { AddOrganizationComponent } from "./clients/add-organization.component";
@@ -32,8 +32,9 @@ import { SetupComponent } from "./setup/setup.component";
     FormsModule,
     OssModule,
     JslibModule,
-    SearchModule,
     ProvidersRoutingModule,
+    OrganizationPlansComponent,
+    SearchModule,
   ],
   declarations: [
     AcceptProviderComponent,
@@ -54,11 +55,4 @@ import { SetupComponent } from "./setup/setup.component";
   ],
   providers: [WebProviderService, ProviderPermissionsGuard],
 })
-export class ProvidersModule {
-  constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {
-    modalService.registerComponentFactoryResolver(
-      AddOrganizationComponent,
-      componentFactoryResolver
-    );
-  }
-}
+export class ProvidersModule {}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts
new file mode 100644
index 00000000000..3ff4d998a3d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts
@@ -0,0 +1,29 @@
+import { inject } from "@angular/core";
+import { ActivatedRouteSnapshot, CanActivateFn, createUrlTreeFromSnapshot } from "@angular/router";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+
+/**
+ * Redirects from root `/sm` to first organization with access to SM
+ */
+export const organizationEnabledGuard: CanActivateFn = async (route: ActivatedRouteSnapshot) => {
+  const syncService = inject(SyncService);
+  const orgService = inject(OrganizationService);
+
+  /** Workaround to avoid service initialization race condition. */
+  if ((await syncService.getLastSync()) == null) {
+    await syncService.fullSync(false);
+  }
+
+  const org = orgService.get(route.params.organizationId);
+  if (org == null || !org.canAccessSecretsManager) {
+    return createUrlTreeFromSnapshot(route, ["/"]);
+  }
+
+  if (!org.enabled) {
+    return createUrlTreeFromSnapshot(route, ["/sm", org.id, "organization-suspended"]);
+  }
+
+  return true;
+};
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/sm.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/secrets-manager/sm.guard.ts
rename to bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
index e639c5f126d..d7a404bf1dd 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
@@ -7,6 +7,11 @@
   [(open)]="open"
   [exactMatch]="true"
 >
+  <i
+    slot="end"
+    *ngIf="!activeOrganization.enabled"
+    class="bwi bwi-exclamation-triangle tw-my-auto !tw-text-danger"
+  ></i>
   <ng-container *ngIf="organizations$ | async as organizations">
     <bit-nav-item
       *ngFor="let org of organizations"
@@ -16,6 +21,11 @@
       (mainContentClicked)="toggle()"
       [hideActiveStyles]="true"
     >
+      <i
+        slot="end"
+        *ngIf="org.enabled == false"
+        class="bwi bwi-exclamation-triangle !tw-text-danger"
+      ></i>
     </bit-nav-item>
   </ng-container>
   <bit-nav-item
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
index 357ee3f2fec..1fb8a0e1e2f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
@@ -12,8 +12,14 @@ import type { Organization } from "@bitwarden/common/admin-console/models/domain
 export class OrgSwitcherComponent {
   protected organizations$: Observable<Organization[]> =
     this.organizationService.organizations$.pipe(
-      map((orgs) => orgs.filter(this.filter).sort((a, b) => a.name.localeCompare(b.name)))
+      map((orgs) =>
+        orgs
+          .filter((org) => this.filter(org))
+          .sort((a, b) => a.name.localeCompare(b.name))
+          .sort((a, b) => (a.enabled ? -1 : 1))
+      )
     );
+
   protected activeOrganization$: Observable<Organization> = combineLatest([
     this.route.paramMap,
     this.organizations$,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index 86fab25608a..868026a8431 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -70,6 +70,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
   protected userIsAdmin: boolean;
   protected showOnboarding = false;
   protected loading = true;
+  protected organizationEnabled = false;
 
   protected view$: Observable<{
     allProjects: ProjectListView[];
@@ -107,6 +108,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
         this.organizationName = org.name;
         this.userIsAdmin = org.isAdmin;
         this.loading = true;
+        this.organizationEnabled = org.enabled;
       });
 
     const projects$ = combineLatest([
@@ -208,6 +210,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
+        organizationEnabled: this.organizationEnabled,
         projectId: projectId,
       },
     });
@@ -218,6 +221,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -227,6 +231,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -246,6 +251,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -256,6 +262,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
         secretId: secretId,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -273,6 +280,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.html
index 0a9239a10a0..a8b3866dc17 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="small">
+  <bit-dialog dialogSize="default">
     <ng-container bitDialogTitle>
       <span>{{ title | i18n }}</span>
       <span class="tw-text-sm tw-normal-case tw-text-muted">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.html
index b56f7d45121..912fa8802b1 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="small">
+  <bit-dialog dialogSize="default">
     <span bitDialogTitle>{{ title | i18n }}</span>
     <span bitDialogContent>
       <div *ngIf="loading" class="tw-text-center">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
index a6a3c958d09..3fd723c7580 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
@@ -18,6 +18,7 @@ export enum OperationType {
 export interface ProjectOperation {
   organizationId: string;
   operation: OperationType;
+  organizationEnabled: boolean;
   projectId?: string;
 }
 
@@ -63,6 +64,15 @@ export class ProjectDialogComponent implements OnInit {
   }
 
   submit = async () => {
+    if (!this.data.organizationEnabled) {
+      this.platformUtilsService.showToast(
+        "error",
+        null,
+        this.i18nService.t("projectsCannotCreate")
+      );
+      return;
+    }
+
     this.formGroup.markAllAsTouched();
 
     if (this.formGroup.invalid) {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
index 2d1690ef0ec..a952a351537 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
@@ -2,6 +2,7 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { combineLatest, combineLatestWith, filter, Observable, startWith, switchMap } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService } from "@bitwarden/components";
@@ -31,6 +32,7 @@ export class ProjectSecretsComponent {
   private organizationId: string;
   private projectId: string;
   protected project$: Observable<ProjectView>;
+  private organizationEnabled: boolean;
 
   constructor(
     private route: ActivatedRoute,
@@ -38,7 +40,8 @@ export class ProjectSecretsComponent {
     private secretService: SecretService,
     private dialogService: DialogService,
     private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService
+    private i18nService: I18nService,
+    private organizationService: OrganizationService
   ) {}
 
   ngOnInit() {
@@ -60,6 +63,7 @@ export class ProjectSecretsComponent {
       switchMap(async ([_, params]) => {
         this.organizationId = params.organizationId;
         this.projectId = params.projectId;
+        this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
         return await this.getSecretsByProject();
       })
     );
@@ -75,6 +79,7 @@ export class ProjectSecretsComponent {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
         secretId: secretId,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -93,6 +98,7 @@ export class ProjectSecretsComponent {
         organizationId: this.organizationId,
         operation: OperationType.Add,
         projectId: this.projectId,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
index c87d238d6a8..148ccc79d26 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
@@ -12,6 +12,7 @@ import {
   takeUntil,
 } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService } from "@bitwarden/components";
@@ -33,7 +34,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
 
   private organizationId: string;
   private projectId: string;
-
+  private organizationEnabled: boolean;
   private destroy$ = new Subject<void>();
 
   constructor(
@@ -42,7 +43,8 @@ export class ProjectComponent implements OnInit, OnDestroy {
     private router: Router,
     private dialogService: DialogService,
     private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService
+    private i18nService: I18nService,
+    private organizationService: OrganizationService
   ) {}
 
   ngOnInit(): void {
@@ -69,6 +71,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
     this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => {
       this.organizationId = params.organizationId;
       this.projectId = params.projectId;
+      this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
     });
   }
 
@@ -82,6 +85,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
+        organizationEnabled: this.organizationEnabled,
         projectId: this.projectId,
       },
     });
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
index 7128e26a3d8..1066828f216 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { combineLatest, lastValueFrom, Observable, startWith, switchMap } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
 import { ProjectListView } from "../../models/view/project-list.view";
@@ -32,12 +33,14 @@ export class ProjectsComponent implements OnInit {
   protected search: string;
 
   private organizationId: string;
+  private organizationEnabled: boolean;
 
   constructor(
     private route: ActivatedRoute,
     private projectService: ProjectService,
     private accessPolicyService: AccessPolicyService,
-    private dialogService: DialogService
+    private dialogService: DialogService,
+    private organizationService: OrganizationService
   ) {}
 
   ngOnInit() {
@@ -48,6 +51,8 @@ export class ProjectsComponent implements OnInit {
     ]).pipe(
       switchMap(async ([params]) => {
         this.organizationId = params.organizationId;
+        this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
+
         return await this.getProjects();
       })
     );
@@ -62,6 +67,7 @@ export class ProjectsComponent implements OnInit {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
+        organizationEnabled: this.organizationEnabled,
         projectId: projectId,
       },
     });
@@ -72,6 +78,7 @@ export class ProjectsComponent implements OnInit {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
index 426542823f9..70eca54e3c5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
@@ -29,6 +29,7 @@ export interface SecretOperation {
   operation: OperationType;
   projectId?: string;
   secretId?: string;
+  organizationEnabled: boolean;
 }
 
 @Component({
@@ -163,6 +164,11 @@ export class SecretDialogComponent implements OnInit {
   }
 
   submit = async () => {
+    if (!this.data.organizationEnabled) {
+      this.platformUtilsService.showToast("error", null, this.i18nService.t("secretsCannotCreate"));
+      return;
+    }
+
     this.formGroup.markAllAsTouched();
 
     if (this.formGroup.invalid) {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
index 7c05f169a3d..b23393de60a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { combineLatestWith, Observable, startWith, switchMap } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService } from "@bitwarden/components";
@@ -29,13 +30,15 @@ export class SecretsComponent implements OnInit {
   protected search: string;
 
   private organizationId: string;
+  private organizationEnabled: boolean;
 
   constructor(
     private route: ActivatedRoute,
     private secretService: SecretService,
     private dialogService: DialogService,
     private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService
+    private i18nService: I18nService,
+    private organizationService: OrganizationService
   ) {}
 
   ngOnInit() {
@@ -44,6 +47,8 @@ export class SecretsComponent implements OnInit {
       combineLatestWith(this.route.params),
       switchMap(async ([_, params]) => {
         this.organizationId = params.organizationId;
+        this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
+
         return await this.getSecrets();
       })
     );
@@ -63,6 +68,7 @@ export class SecretsComponent implements OnInit {
         organizationId: this.organizationId,
         operation: OperationType.Edit,
         secretId: secretId,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -80,6 +86,7 @@ export class SecretsComponent implements OnInit {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
index 048248531d1..9af34837037 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="small">
+  <bit-dialog dialogSize="default">
     <ng-container bitDialogTitle>
       <span>{{ title }}</span>
       <span class="tw-text-sm tw-normal-case tw-text-muted">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
index 5f7260025cf..55f6ff4da14 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="small">
+  <bit-dialog dialogSize="default">
     <ng-container bitDialogTitle>{{ title | i18n }}</ng-container>
     <div bitDialogContent>
       <div *ngIf="loading" class="tw-text-center">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
index 1f42537f956..decd042cc14 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
@@ -18,6 +18,7 @@ export interface ServiceAccountOperation {
   organizationId: string;
   serviceAccountId?: string;
   operation: OperationType;
+  organizationEnabled: boolean;
 }
 
 @Component({
@@ -62,6 +63,15 @@ export class ServiceAccountDialogComponent {
   }
 
   submit = async () => {
+    if (!this.data.organizationEnabled) {
+      this.platformUtilsService.showToast(
+        "error",
+        null,
+        this.i18nService.t("serviceAccountsCannotCreate")
+      );
+      return;
+    }
+
     this.formGroup.markAllAsTouched();
 
     if (this.formGroup.invalid) {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
index 808073ba810..bebd9ddca62 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { combineLatest, Observable, startWith, switchMap } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
 import {
@@ -30,12 +31,14 @@ export class ServiceAccountsComponent implements OnInit {
   protected search: string;
 
   private organizationId: string;
+  private organizationEnabled: boolean;
 
   constructor(
     private route: ActivatedRoute,
     private dialogService: DialogService,
     private accessPolicyService: AccessPolicyService,
-    private serviceAccountService: ServiceAccountService
+    private serviceAccountService: ServiceAccountService,
+    private organizationService: OrganizationService
   ) {}
 
   ngOnInit() {
@@ -46,6 +49,8 @@ export class ServiceAccountsComponent implements OnInit {
     ]).pipe(
       switchMap(async ([params]) => {
         this.organizationId = params.organizationId;
+        this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
+
         return await this.getServiceAccounts();
       })
     );
@@ -56,6 +61,7 @@ export class ServiceAccountsComponent implements OnInit {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -66,6 +72,7 @@ export class ServiceAccountsComponent implements OnInit {
         organizationId: this.organizationId,
         serviceAccountId: serviceAccountId,
         operation: OperationType.Edit,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
index 7ecc2f917a4..67a93e8ad87 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
@@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
 import {
@@ -24,13 +25,18 @@ import {
 })
 export class NewMenuComponent implements OnInit, OnDestroy {
   private organizationId: string;
+  private organizationEnabled: boolean;
   private destroy$: Subject<void> = new Subject<void>();
-
-  constructor(private route: ActivatedRoute, private dialogService: DialogService) {}
+  constructor(
+    private route: ActivatedRoute,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService
+  ) {}
 
   ngOnInit() {
     this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params: any) => {
       this.organizationId = params.organizationId;
+      this.organizationEnabled = this.organizationService.get(params.organizationId)?.enabled;
     });
   }
 
@@ -44,6 +50,7 @@ export class NewMenuComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -53,6 +60,7 @@ export class NewMenuComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
@@ -62,6 +70,7 @@ export class NewMenuComponent implements OnInit, OnDestroy {
       data: {
         organizationId: this.organizationId,
         operation: OperationType.Add,
+        organizationEnabled: this.organizationEnabled,
       },
     });
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html
new file mode 100644
index 00000000000..8de68f65988
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html
@@ -0,0 +1,7 @@
+<sm-header [title]="organizationName$ | async">
+  <sm-new-menu></sm-new-menu>
+</sm-header>
+<bit-no-items [icon]="NoAccess">
+  <ng-container slot="title">{{ "organizationIsDisabled" | i18n }}</ng-container>
+  <ng-container slot="description">{{ "secretsAccessSuspended" | i18n }}</ng-container>
+</bit-no-items>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
new file mode 100644
index 00000000000..73f89c0826d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
@@ -0,0 +1,18 @@
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { map } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Icon, Icons } from "@bitwarden/components";
+
+@Component({
+  templateUrl: "./org-suspended.component.html",
+})
+export class OrgSuspendedComponent {
+  constructor(private organizationService: OrganizationService, private route: ActivatedRoute) {}
+
+  protected NoAccess: Icon = Icons.NoAccess;
+  protected organizationName$ = this.route.params.pipe(
+    map((params) => this.organizationService.get(params.organizationId)?.name)
+  );
+}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts
index 6d59503b50a..d2990f4c67f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts
@@ -17,6 +17,7 @@ import { BulkConfirmationDialogComponent } from "./dialogs/bulk-confirmation-dia
 import { BulkStatusDialogComponent } from "./dialogs/bulk-status-dialog.component";
 import { HeaderComponent } from "./header.component";
 import { NewMenuComponent } from "./new-menu.component";
+import { OrgSuspendedComponent } from "./org-suspended.component";
 import { ProjectsListComponent } from "./projects-list.component";
 import { SecretsListComponent } from "./secrets-list.component";
 
@@ -55,6 +56,7 @@ import { SecretsListComponent } from "./secrets-list.component";
     ProjectsListComponent,
     SecretsListComponent,
     AccessSelectorComponent,
+    OrgSuspendedComponent,
   ],
   providers: [],
   bootstrap: [],
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
index 5c18bab4e42..0cad3129a40 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
@@ -2,10 +2,10 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard";
 import { buildFlaggedRoute } from "@bitwarden/web-vault/app/oss-routing.module";
 
+import { organizationEnabledGuard } from "./guards/sm-org-enabled.guard";
+import { canActivateSM } from "./guards/sm.guard";
 import { LayoutComponent } from "./layout/layout.component";
 import { NavigationComponent } from "./layout/navigation.component";
 import { OverviewModule } from "./overview/overview.module";
@@ -13,7 +13,7 @@ import { ProjectsModule } from "./projects/projects.module";
 import { SecretsModule } from "./secrets/secrets.module";
 import { ServiceAccountsModule } from "./service-accounts/service-accounts.module";
 import { SettingsModule } from "./settings/settings.module";
-import { canActivateSM } from "./sm.guard";
+import { OrgSuspendedComponent } from "./shared/org-suspended.component";
 import { TrashModule } from "./trash/trash.module";
 
 const routes: Routes = [
@@ -29,52 +29,59 @@ const routes: Routes = [
       {
         path: ":organizationId",
         component: LayoutComponent,
-        canActivate: [AuthGuard, OrganizationPermissionsGuard],
-        data: {
-          organizationPermissions: (org: Organization) => org.canAccessSecretsManager,
-        },
+        canActivate: [AuthGuard],
         children: [
           {
             path: "",
             component: NavigationComponent,
             outlet: "sidebar",
           },
-          {
-            path: "secrets",
-            loadChildren: () => SecretsModule,
-            data: {
-              titleId: "secrets",
-            },
-          },
-          {
-            path: "projects",
-            loadChildren: () => ProjectsModule,
-            data: {
-              titleId: "projects",
-            },
-          },
-          {
-            path: "service-accounts",
-            loadChildren: () => ServiceAccountsModule,
-            data: {
-              titleId: "serviceAccounts",
-            },
-          },
-          {
-            path: "trash",
-            loadChildren: () => TrashModule,
-            data: {
-              titleId: "trash",
-            },
-          },
-          {
-            path: "settings",
-            loadChildren: () => SettingsModule,
-          },
           {
             path: "",
-            loadChildren: () => OverviewModule,
-            pathMatch: "full",
+            canActivate: [organizationEnabledGuard],
+            children: [
+              {
+                path: "secrets",
+                loadChildren: () => SecretsModule,
+                data: {
+                  titleId: "secrets",
+                },
+              },
+              {
+                path: "projects",
+                loadChildren: () => ProjectsModule,
+                data: {
+                  titleId: "projects",
+                },
+              },
+              {
+                path: "service-accounts",
+                loadChildren: () => ServiceAccountsModule,
+                data: {
+                  titleId: "serviceAccounts",
+                },
+              },
+              {
+                path: "trash",
+                loadChildren: () => TrashModule,
+                data: {
+                  titleId: "trash",
+                },
+              },
+              {
+                path: "settings",
+                loadChildren: () => SettingsModule,
+              },
+              {
+                path: "",
+                loadChildren: () => OverviewModule,
+                pathMatch: "full",
+              },
+            ],
+          },
+          {
+            path: "organization-suspended",
+            component: OrgSuspendedComponent,
           },
         ],
       },
diff --git a/libs/angular/src/auth/components/sso.component.ts b/libs/angular/src/auth/components/sso.component.ts
index c52902d49a0..3484bb46d2f 100644
--- a/libs/angular/src/auth/components/sso.component.ts
+++ b/libs/angular/src/auth/components/sso.component.ts
@@ -76,12 +76,8 @@ export class SsoComponent {
           state != null &&
           this.checkState(state, qParams.state)
         ) {
-          // We are not using a query param to pass org identifier around specifically
-          // for the browser SSO case when it needs it on extension open after SSO success
-          // on the TDE login decryption options component
           const ssoOrganizationIdentifier = this.getOrgIdentifierFromState(qParams.state);
           await this.logIn(qParams.code, codeVerifier, ssoOrganizationIdentifier);
-          await this.stateService.setUserSsoOrganizationIdentifier(ssoOrganizationIdentifier);
         }
       } else if (
         qParams.clientId != null &&
@@ -183,14 +179,14 @@ export class SsoComponent {
     return authorizeUrl;
   }
 
-  private async logIn(code: string, codeVerifier: string, orgIdentifier: string) {
+  private async logIn(code: string, codeVerifier: string, orgSsoIdentifier: string): Promise<void> {
     this.loggingIn = true;
     try {
       const credentials = new SsoLogInCredentials(
         code,
         codeVerifier,
         this.redirectUri,
-        orgIdentifier
+        orgSsoIdentifier
       );
       this.formPromise = this.authService.logIn(credentials);
       const authResult = await this.formPromise;
@@ -199,9 +195,18 @@ export class SsoComponent {
         await this.stateService.getAccountDecryptionOptions();
 
       if (authResult.requiresTwoFactor) {
-        return await this.handleTwoFactorRequired(orgIdentifier);
+        return await this.handleTwoFactorRequired(orgSsoIdentifier);
       }
 
+      // Everything after the 2FA check is considered a successful login
+      // Just have to figure out where to send the user
+
+      // Save off the OrgSsoIdentifier for use in the TDE flows
+      // - TDE login decryption options component
+      // - Browser SSO on extension open
+      // Note: you cannot set this in state before 2FA b/c there won't be an account in state.
+      await this.stateService.setUserSsoOrganizationIdentifier(orgSsoIdentifier);
+
       const tdeEnabled = await this.isTrustedDeviceEncEnabled(
         acctDecryptionOpts.trustedDeviceOption
       );
@@ -209,7 +214,7 @@ export class SsoComponent {
       if (tdeEnabled) {
         return await this.handleTrustedDeviceEncryptionEnabled(
           authResult,
-          orgIdentifier,
+          orgSsoIdentifier,
           acctDecryptionOpts
         );
       }
@@ -223,13 +228,13 @@ export class SsoComponent {
 
       if (requireSetPassword || authResult.resetMasterPassword) {
         // Change implies going no password -> password in this case
-        return await this.handleChangePasswordRequired(orgIdentifier);
+        return await this.handleChangePasswordRequired(orgSsoIdentifier);
       }
 
       // Users enrolled in admin acct recovery can be forced to set a new password after
       // having the admin set a temp password for them
       if (authResult.forcePasswordReset == ForceResetPasswordReason.AdminForcePasswordReset) {
-        return await this.handleForcePasswordReset(orgIdentifier);
+        return await this.handleForcePasswordReset(orgSsoIdentifier);
       }
 
       // Standard SSO login success case
diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index 817a562b557..756218a1e19 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -235,6 +235,11 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
       return;
     }
 
+    // Save off the OrgSsoIdentifier for use in the TDE flows
+    // - TDE login decryption options component
+    // - Browser SSO on extension open
+    await this.stateService.setUserSsoOrganizationIdentifier(this.orgIdentifier);
+
     this.loginService.clearValues();
 
     const acctDecryptionOpts: AccountDecryptionOptions =
diff --git a/libs/angular/src/directives/fallback-src.directive.ts b/libs/angular/src/directives/fallback-src.directive.ts
index 11bce2052b7..082c8534fa3 100644
--- a/libs/angular/src/directives/fallback-src.directive.ts
+++ b/libs/angular/src/directives/fallback-src.directive.ts
@@ -6,9 +6,15 @@ import { Directive, ElementRef, HostListener, Input } from "@angular/core";
 export class FallbackSrcDirective {
   @Input("appFallbackSrc") appFallbackSrc: string;
 
+  /** Only try setting the fallback once. This prevents an infinite loop if the fallback itself is missing. */
+  private tryFallback = true;
+
   constructor(private el: ElementRef) {}
 
   @HostListener("error") onError() {
-    this.el.nativeElement.src = this.appFallbackSrc;
+    if (this.tryFallback) {
+      this.el.nativeElement.src = this.appFallbackSrc;
+      this.tryFallback = false;
+    }
   }
 }
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 5c19d0fe771..e2019c7d33f 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -136,7 +136,6 @@ import {
   FolderService as FolderServiceAbstraction,
   InternalFolderService,
 } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
 import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
@@ -150,13 +149,19 @@ import {
   VaultExportService,
   VaultExportServiceAbstraction,
 } from "@bitwarden/exporter/vault-export";
+import {
+  ImportApiService,
+  ImportApiServiceAbstraction,
+  ImportService,
+  ImportServiceAbstraction,
+} from "@bitwarden/importer";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 import { AuthGuard } from "../auth/guards/auth.guard";
 import { UnauthGuard } from "../auth/guards/unauth.guard";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service";
 import { BroadcasterService } from "../platform/services/broadcaster.service";
 import { FormValidationErrorsService } from "../platform/services/form-validation-errors.service";
-import { PasswordRepromptService } from "../vault/services/password-reprompt.service";
 
 import {
   LOCALES_DIRECTORY,
@@ -180,6 +185,8 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
     AuthGuard,
     UnauthGuard,
     ModalService,
+    PasswordRepromptService,
+
     { provide: WINDOW, useValue: window },
     {
       provide: LOCALE_ID,
@@ -485,6 +492,23 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
         STATE_SERVICE_USE_CACHE,
       ],
     },
+    {
+      provide: ImportApiServiceAbstraction,
+      useClass: ImportApiService,
+      deps: [ApiServiceAbstraction],
+    },
+    {
+      provide: ImportServiceAbstraction,
+      useClass: ImportService,
+      deps: [
+        CipherServiceAbstraction,
+        FolderServiceAbstraction,
+        ImportApiServiceAbstraction,
+        I18nServiceAbstraction,
+        CollectionServiceAbstraction,
+        CryptoServiceAbstraction,
+      ],
+    },
     {
       provide: VaultExportServiceAbstraction,
       useClass: VaultExportService,
@@ -580,7 +604,6 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
         UserVerificationApiServiceAbstraction,
       ],
     },
-    { provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
     {
       provide: OrganizationServiceAbstraction,
       useClass: OrganizationService,
diff --git a/libs/angular/src/services/modal.service.ts b/libs/angular/src/services/modal.service.ts
index ba461764ba8..da47368c2fa 100644
--- a/libs/angular/src/services/modal.service.ts
+++ b/libs/angular/src/services/modal.service.ts
@@ -88,13 +88,6 @@ export class ModalService {
     return modalRef;
   }
 
-  registerComponentFactoryResolver<T>(
-    componentType: Type<T>,
-    componentFactoryResolver: ComponentFactoryResolver
-  ): void {
-    this.factoryResolvers.set(componentType, componentFactoryResolver);
-  }
-
   resolveComponentFactory<T>(componentType: Type<T>): ComponentFactory<T> {
     if (this.factoryResolvers.has(componentType)) {
       return this.factoryResolvers.get(componentType).resolveComponentFactory(componentType);
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index 3aca51e44a8..fb065587bf9 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -21,7 +21,6 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -34,6 +33,7 @@ import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 @Directive()
 export class AddEditComponent implements OnInit, OnDestroy {
diff --git a/libs/angular/src/vault/components/password-reprompt.component.ts b/libs/angular/src/vault/components/password-reprompt.component.ts
deleted file mode 100644
index 1094b379316..00000000000
--- a/libs/angular/src/vault/components/password-reprompt.component.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Directive } from "@angular/core";
-
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
-import { ModalRef } from "../../components/modal/modal.ref";
-
-/**
- * Used to verify the user's Master Password for the "Master Password Re-prompt" feature only.
- * See UserVerificationComponent for any other situation where you need to verify the user's identity.
- */
-@Directive()
-export class PasswordRepromptComponent {
-  showPassword = false;
-  masterPassword = "";
-
-  constructor(
-    private modalRef: ModalRef,
-    private cryptoService: CryptoService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService
-  ) {}
-
-  togglePassword() {
-    this.showPassword = !this.showPassword;
-  }
-
-  async submit() {
-    const storedMasterKey = await this.cryptoService.getOrDeriveMasterKey(this.masterPassword);
-    if (!(await this.cryptoService.compareAndUpdateKeyHash(this.masterPassword, storedMasterKey))) {
-      this.platformUtilsService.showToast(
-        "error",
-        this.i18nService.t("errorOccurred"),
-        this.i18nService.t("invalidMasterPassword")
-      );
-      return;
-    }
-
-    this.modalRef.close(true);
-  }
-}
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 40523afd850..781034aa9f3 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -27,7 +27,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
@@ -35,6 +34,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
 const BroadcasterSubscriptionId = "ViewComponent";
 
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 1f3b046afbe..cc0873351b8 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -4,6 +4,7 @@ export enum FeatureFlag {
   TrustedDeviceEncryption = "trusted-device-encryption",
   PasswordlessLogin = "passwordless-login",
   AutofillV2 = "autofill-v2",
+  BrowserFilelessImport = "browser-fileless-import",
 }
 
 // Replace this with a type safe lookup of the feature flag values in PM-2282
diff --git a/libs/common/src/platform/abstractions/crypto-function.service.ts b/libs/common/src/platform/abstractions/crypto-function.service.ts
index 9f171872ae5..755eaeb1a75 100644
--- a/libs/common/src/platform/abstractions/crypto-function.service.ts
+++ b/libs/common/src/platform/abstractions/crypto-function.service.ts
@@ -52,8 +52,16 @@ export abstract class CryptoFunctionService {
     mac: string,
     key: SymmetricCryptoKey
   ) => DecryptParameters<Uint8Array | string>;
-  aesDecryptFast: (parameters: DecryptParameters<Uint8Array | string>) => Promise<string>;
-  aesDecrypt: (data: Uint8Array, iv: Uint8Array, key: Uint8Array) => Promise<Uint8Array>;
+  aesDecryptFast: (
+    parameters: DecryptParameters<Uint8Array | string>,
+    mode: "cbc" | "ecb"
+  ) => Promise<string>;
+  aesDecrypt: (
+    data: Uint8Array,
+    iv: Uint8Array,
+    key: Uint8Array,
+    mode: "cbc" | "ecb"
+  ) => Promise<Uint8Array>;
   rsaEncrypt: (
     data: Uint8Array,
     publicKey: Uint8Array,
diff --git a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
index d847dcf77b4..2df24bb33fd 100644
--- a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
+++ b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
@@ -99,7 +99,7 @@ export class EncryptServiceImplementation implements EncryptService {
       }
     }
 
-    return await this.cryptoFunctionService.aesDecryptFast(fastParams);
+    return await this.cryptoFunctionService.aesDecryptFast(fastParams, "cbc");
   }
 
   async decryptToBytes(encThing: Encrypted, key: SymmetricCryptoKey): Promise<Uint8Array> {
@@ -140,7 +140,8 @@ export class EncryptServiceImplementation implements EncryptService {
     const result = await this.cryptoFunctionService.aesDecrypt(
       encThing.dataBytes,
       encThing.ivBytes,
-      key.encKey
+      key.encKey,
+      "cbc"
     );
 
     return result ?? null;
diff --git a/libs/common/src/platform/services/encrypt.service.spec.ts b/libs/common/src/platform/services/encrypt.service.spec.ts
index bc1be50a164..aa3039a4708 100644
--- a/libs/common/src/platform/services/encrypt.service.spec.ts
+++ b/libs/common/src/platform/services/encrypt.service.spec.ts
@@ -115,7 +115,8 @@ describe("EncryptService", () => {
       expect(cryptoFunctionService.aesDecrypt).toBeCalledWith(
         expect.toEqualBuffer(encBuffer.dataBytes),
         expect.toEqualBuffer(encBuffer.ivBytes),
-        expect.toEqualBuffer(key.encKey)
+        expect.toEqualBuffer(key.encKey),
+        "cbc"
       );
 
       expect(actual).toEqualBuffer(decryptedBytes);
diff --git a/libs/common/src/platform/services/web-crypto-function.service.spec.ts b/libs/common/src/platform/services/web-crypto-function.service.spec.ts
index a4b7a3ccaf4..986aecb4c40 100644
--- a/libs/common/src/platform/services/web-crypto-function.service.spec.ts
+++ b/libs/common/src/platform/services/web-crypto-function.service.spec.ts
@@ -3,6 +3,7 @@ import { Substitute } from "@fluffy-spoon/substitute";
 
 import { Utils } from "../../platform/misc/utils";
 import { PlatformUtilsService } from "../abstractions/platform-utils.service";
+import { DecryptParameters } from "../models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 
 import { WebCryptoFunctionService } from "./web-crypto-function.service";
@@ -233,7 +234,7 @@ describe("WebCrypto Function Service", () => {
     });
   });
 
-  describe("aesEncrypt", () => {
+  describe("aesEncrypt CBC mode", () => {
     it("should successfully encrypt data", async () => {
       const cryptoFunctionService = getWebCryptoFunctionService();
       const iv = makeStaticByteArray(16);
@@ -254,7 +255,7 @@ describe("WebCrypto Function Service", () => {
       const b64Iv = Utils.fromBufferToB64(iv);
       const symKey = new SymmetricCryptoKey(key);
       const params = cryptoFunctionService.aesDecryptFastParameters(encData, b64Iv, null, symKey);
-      const decValue = await cryptoFunctionService.aesDecryptFast(params);
+      const decValue = await cryptoFunctionService.aesDecryptFast(params, "cbc");
       expect(decValue).toBe(value);
     });
 
@@ -265,30 +266,53 @@ describe("WebCrypto Function Service", () => {
       const value = "EncryptMe!";
       const data = Utils.fromUtf8ToArray(value);
       const encValue = new Uint8Array(await cryptoFunctionService.aesEncrypt(data, iv, key));
-      const decValue = await cryptoFunctionService.aesDecrypt(encValue, iv, key);
+      const decValue = await cryptoFunctionService.aesDecrypt(encValue, iv, key, "cbc");
       expect(Utils.fromBufferToUtf8(decValue)).toBe(value);
     });
   });
 
-  describe("aesDecryptFast", () => {
+  describe("aesDecryptFast CBC mode", () => {
     it("should successfully decrypt data", async () => {
       const cryptoFunctionService = getWebCryptoFunctionService();
       const iv = Utils.fromBufferToB64(makeStaticByteArray(16));
       const symKey = new SymmetricCryptoKey(makeStaticByteArray(32));
       const data = "ByUF8vhyX4ddU9gcooznwA==";
       const params = cryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
-      const decValue = await cryptoFunctionService.aesDecryptFast(params);
+      const decValue = await cryptoFunctionService.aesDecryptFast(params, "cbc");
       expect(decValue).toBe("EncryptMe!");
     });
   });
 
-  describe("aesDecrypt", () => {
+  describe("aesDecryptFast ECB mode", () => {
+    it("should successfully decrypt data", async () => {
+      const cryptoFunctionService = getWebCryptoFunctionService();
+      const key = makeStaticByteArray(32);
+      const data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
+      const params = new DecryptParameters<string>();
+      params.encKey = Utils.fromBufferToByteString(key);
+      params.data = Utils.fromBufferToByteString(data);
+      const decValue = await cryptoFunctionService.aesDecryptFast(params, "ecb");
+      expect(decValue).toBe("EncryptMe!");
+    });
+  });
+
+  describe("aesDecrypt CBC mode", () => {
     it("should successfully decrypt data", async () => {
       const cryptoFunctionService = getWebCryptoFunctionService();
       const iv = makeStaticByteArray(16);
       const key = makeStaticByteArray(32);
       const data = Utils.fromB64ToArray("ByUF8vhyX4ddU9gcooznwA==");
-      const decValue = await cryptoFunctionService.aesDecrypt(data, iv, key);
+      const decValue = await cryptoFunctionService.aesDecrypt(data, iv, key, "cbc");
+      expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
+    });
+  });
+
+  describe("aesDecrypt ECB mode", () => {
+    it("should successfully decrypt data", async () => {
+      const cryptoFunctionService = getWebCryptoFunctionService();
+      const key = makeStaticByteArray(32);
+      const data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
+      const decValue = await cryptoFunctionService.aesDecrypt(data, null, key, "ecb");
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
     });
   });
diff --git a/libs/common/src/platform/services/web-crypto-function.service.ts b/libs/common/src/platform/services/web-crypto-function.service.ts
index 7c52cae543e..93b8ba26664 100644
--- a/libs/common/src/platform/services/web-crypto-function.service.ts
+++ b/libs/common/src/platform/services/web-crypto-function.service.ts
@@ -273,17 +273,37 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
     return p;
   }
 
-  aesDecryptFast(parameters: DecryptParameters<string>): Promise<string> {
-    const dataBuffer = forge.util.createBuffer(parameters.data);
-    const decipher = forge.cipher.createDecipher("AES-CBC", parameters.encKey);
-    decipher.start({ iv: parameters.iv });
+  aesDecryptFast(parameters: DecryptParameters<string>, mode: "cbc" | "ecb"): Promise<string> {
+    const decipher = (forge as any).cipher.createDecipher(
+      this.toWebCryptoAesMode(mode),
+      parameters.encKey
+    );
+    const options = {} as any;
+    if (mode === "cbc") {
+      options.iv = parameters.iv;
+    }
+    const dataBuffer = (forge as any).util.createBuffer(parameters.data);
+    decipher.start(options);
     decipher.update(dataBuffer);
     decipher.finish();
     const val = decipher.output.toString();
     return Promise.resolve(val);
   }
 
-  async aesDecrypt(data: Uint8Array, iv: Uint8Array, key: Uint8Array): Promise<Uint8Array> {
+  async aesDecrypt(
+    data: Uint8Array,
+    iv: Uint8Array,
+    key: Uint8Array,
+    mode: "cbc" | "ecb"
+  ): Promise<Uint8Array> {
+    if (mode === "ecb") {
+      // Web crypto does not support AES-ECB mode, so we need to do this in forge.
+      const params = new DecryptParameters<string>();
+      params.data = this.toByteString(data);
+      params.encKey = this.toByteString(key);
+      const result = await this.aesDecryptFast(params, "ecb");
+      return Utils.fromByteStringToArray(result);
+    }
     const impKey = await this.subtle.importKey("raw", key, { name: "AES-CBC" } as any, false, [
       "decrypt",
     ]);
@@ -411,6 +431,10 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
     return algorithm === "sha1" ? "SHA-1" : algorithm === "sha256" ? "SHA-256" : "SHA-512";
   }
 
+  private toWebCryptoAesMode(mode: "cbc" | "ecb"): string {
+    return mode === "cbc" ? "AES-CBC" : "AES-ECB";
+  }
+
   // ref: https://stackoverflow.com/a/47880734/1090359
   private checkIfWasmSupported(): boolean {
     try {
diff --git a/libs/common/src/vault/abstractions/password-reprompt.service.ts b/libs/common/src/vault/abstractions/password-reprompt.service.ts
deleted file mode 100644
index 6253425b34d..00000000000
--- a/libs/common/src/vault/abstractions/password-reprompt.service.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export abstract class PasswordRepromptService {
-  protectedFields: () => string[];
-  showPasswordPrompt: () => Promise<boolean>;
-  enabled: () => Promise<boolean>;
-}
diff --git a/libs/common/src/vault/models/view/collection.view.ts b/libs/common/src/vault/models/view/collection.view.ts
index 52644035c0c..98159c99cc6 100644
--- a/libs/common/src/vault/models/view/collection.view.ts
+++ b/libs/common/src/vault/models/view/collection.view.ts
@@ -1,3 +1,4 @@
+import { Organization } from "../../../admin-console/models/domain/organization";
 import { ITreeNodeObject } from "../../../models/domain/tree-node";
 import { View } from "../../../models/view/view";
 import { Collection } from "../domain/collection";
@@ -10,6 +11,7 @@ export class CollectionView implements View, ITreeNodeObject {
   organizationId: string = null;
   name: string = null;
   externalId: string = null;
+  // readOnly applies to the items within a collection
   readOnly: boolean = null;
   hidePasswords: boolean = null;
 
@@ -26,4 +28,24 @@ export class CollectionView implements View, ITreeNodeObject {
       this.hidePasswords = c.hidePasswords;
     }
   }
+
+  // For editing collection details, not the items within it.
+  canEdit(org: Organization): boolean {
+    if (org.id !== this.organizationId) {
+      throw new Error(
+        "Id of the organization provided does not match the org id of the collection."
+      );
+    }
+    return org?.canEditAnyCollection || org?.canEditAssignedCollections;
+  }
+
+  // For deleting a collection, not the items within it.
+  canDelete(org: Organization): boolean {
+    if (org.id !== this.organizationId) {
+      throw new Error(
+        "Id of the organization provided does not match the org id of the collection."
+      );
+    }
+    return org?.canDeleteAnyCollection || org?.canDeleteAssignedCollections;
+  }
 }
diff --git a/libs/components/src/icon/icons/index.ts b/libs/components/src/icon/icons/index.ts
index 03fdb729bc7..02cb975e095 100644
--- a/libs/components/src/icon/icons/index.ts
+++ b/libs/components/src/icon/icons/index.ts
@@ -1 +1,2 @@
 export * from "./search";
+export * from "./no-access";
diff --git a/libs/components/src/icon/icons/no-access.ts b/libs/components/src/icon/icons/no-access.ts
new file mode 100644
index 00000000000..f9ad048752a
--- /dev/null
+++ b/libs/components/src/icon/icons/no-access.ts
@@ -0,0 +1,12 @@
+import { svgIcon } from "../icon";
+
+export const NoAccess = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" width="154" height="130" fill="none">
+  <path class="tw-stroke-secondary-500" d="M60.795 112.1h55.135a4 4 0 0 0 4-4V59.65M32.9 51.766V6a4 4 0 0 1 4-4h79.03a4 4 0 0 1 4 4v19.992"  stroke-width="4"/>
+  <path class="tw-stroke-secondary-500" d="M46.997 21.222h13.806M69.832 21.222h13.806M93.546 21.222h13.806M46.997 44.188h13.806M69.832 44.188h13.806M93.546 44.188h13.806M50.05 67.02h10.753M69.832 67.02h13.806M93.546 67.02h13.806M46.997 90.118h13.806M69.832 90.118h13.806M93.546 90.118h13.806" stroke-width="2" stroke-linecap="round"/>
+  <path class="tw-stroke-secondary-500" d="M30.914 89.366c10.477 0 18.97-8.493 18.97-18.97 0-10.476-8.493-18.97-18.97-18.97-10.476 0-18.969 8.494-18.969 18.97 0 10.477 8.493 18.97 18.97 18.97ZM2.313 117.279c2.183-16.217 15.44-27.362 29.623-27.362 14.07 0 25.942 11.022 27.898 27.33.167 1.39-.988 2.753-2.719 2.753H5c-1.741 0-2.87-1.366-2.687-2.721Z" stroke-width="4"/>
+  <path class="tw-stroke-danger-500" d="m147.884 50.361-15.89-27.522c-2.31-4-8.083-4-10.392 0l-15.891 27.523c-2.309 4 .578 9 5.196 9h31.781c4.619 0 7.505-5 5.196-9Z" stroke-width="4"/>
+  <path class="tw-stroke-danger-500" d="M126.798 29.406v16.066" stroke-width="4" stroke-linecap="round"/>
+  <path class="tw-fill-danger-500" d="M126.798 54.727a2.635 2.635 0 1 0 0-5.27 2.635 2.635 0 0 0 0 5.27Z" />
+</svg>
+`;
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index ca9a7c3aecf..118f78a1865 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -17,7 +17,7 @@
       [bitIconButton]="
         open ? 'bwi-angle-up' : variant === 'tree' ? 'bwi-angle-right' : 'bwi-angle-down'
       "
-      [buttonType]="'main'"
+      [buttonType]="'light'"
       (click)="toggle($event)"
       size="small"
       [title]="'toggleCollapse' | i18n"
@@ -32,8 +32,11 @@
   <ng-container slot="start" *ngIf="variant === 'tree'">
     <ng-container *ngTemplateOutlet="button"></ng-container>
   </ng-container>
-  <ng-container slot="end" *ngIf="variant !== 'tree'">
-    <ng-container *ngTemplateOutlet="button"></ng-container>
+  <ng-container slot="end">
+    <ng-content select="[slot=end]"></ng-content>
+    <ng-container *ngIf="variant !== 'tree'">
+      <ng-container *ngTemplateOutlet="button"></ng-container>
+    </ng-container>
   </ng-container>
 </bit-nav-item>
 
diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html
index 32c8dfbf980..02705e821eb 100644
--- a/libs/components/src/navigation/nav-item.component.html
+++ b/libs/components/src/navigation/nav-item.component.html
@@ -73,7 +73,7 @@
     </ng-template>
 
     <div
-      class="tw-flex tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:!tw-text-alt2"
+      class="tw-flex tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2"
     >
       <ng-content select="[slot=end]"></ng-content>
     </div>
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index 7fdbadce31a..c8f90eabcff 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -64,7 +64,7 @@ export const WithChildButtons: Story = {
           slot="start"
           class="tw-ml-auto"
           [bitIconButton]="'bwi-clone'"
-          [buttonType]="'contrast'"
+          [buttonType]="'light'"
           size="small"
           aria-label="option 1"
         ></button>
@@ -72,7 +72,7 @@ export const WithChildButtons: Story = {
           slot="end"
           class="tw-ml-auto"
           [bitIconButton]="'bwi-pencil-square'"
-          [buttonType]="'contrast'"
+          [buttonType]="'light'"
           size="small"
           aria-label="option 2"
         ></button>
@@ -80,7 +80,7 @@ export const WithChildButtons: Story = {
           slot="end"
           class="tw-ml-auto"
           [bitIconButton]="'bwi-check'"
-          [buttonType]="'contrast'"
+          [buttonType]="'light'"
           size="small"
           aria-label="option 3"
         ></button>
diff --git a/libs/importer/src/importers/lastpass/access/enums/duo-factor.ts b/libs/importer/src/importers/lastpass/access/enums/duo-factor.ts
new file mode 100644
index 00000000000..aa65583935e
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/duo-factor.ts
@@ -0,0 +1,6 @@
+export enum DuoFactor {
+  Push,
+  Call,
+  Passcode,
+  SendPasscodesBySms,
+}
diff --git a/libs/importer/src/importers/lastpass/access/enums/duo-status.ts b/libs/importer/src/importers/lastpass/access/enums/duo-status.ts
new file mode 100644
index 00000000000..6397db5dc91
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/duo-status.ts
@@ -0,0 +1,5 @@
+export enum DuoStatus {
+  Success,
+  Error,
+  Info,
+}
diff --git a/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts b/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts
new file mode 100644
index 00000000000..32e74c36ee1
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts
@@ -0,0 +1,8 @@
+export enum IdpProvider {
+  Azure = 0,
+  OktaAuthServer = 1,
+  OktaNoAuthServer = 2,
+  Google = 3,
+  PingOne = 4,
+  OneLogin = 5,
+}
diff --git a/libs/importer/src/importers/lastpass/access/enums/index.ts b/libs/importer/src/importers/lastpass/access/enums/index.ts
new file mode 100644
index 00000000000..0059030e0aa
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/index.ts
@@ -0,0 +1,6 @@
+export { DuoFactor } from "./duo-factor";
+export { DuoStatus } from "./duo-status";
+export { IdpProvider } from "./idp-provider";
+export { LastpassLoginType } from "./lastpass-login-type";
+export { OtpMethod } from "./otp-method";
+export { Platform } from "./platform";
diff --git a/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts b/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts
new file mode 100644
index 00000000000..611dd0b6dab
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts
@@ -0,0 +1,5 @@
+export enum LastpassLoginType {
+  MasterPassword = 0,
+  // Not sure what Types 1 and 2 are?
+  Federated = 3,
+}
diff --git a/libs/importer/src/importers/lastpass/access/enums/otp-method.ts b/libs/importer/src/importers/lastpass/access/enums/otp-method.ts
new file mode 100644
index 00000000000..6b940486ff0
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/otp-method.ts
@@ -0,0 +1,5 @@
+export enum OtpMethod {
+  GoogleAuth,
+  MicrosoftAuth,
+  Yubikey,
+}
diff --git a/libs/importer/src/importers/lastpass/access/enums/platform.ts b/libs/importer/src/importers/lastpass/access/enums/platform.ts
new file mode 100644
index 00000000000..283e0c36ce2
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/enums/platform.ts
@@ -0,0 +1,4 @@
+export enum Platform {
+  Desktop,
+  Mobile,
+}
diff --git a/libs/importer/src/importers/lastpass/access/index.ts b/libs/importer/src/importers/lastpass/access/index.ts
new file mode 100644
index 00000000000..a124a44b315
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/index.ts
@@ -0,0 +1 @@
+export { Vault } from "./vault";
diff --git a/libs/importer/src/importers/lastpass/access/models/account.ts b/libs/importer/src/importers/lastpass/access/models/account.ts
new file mode 100644
index 00000000000..d87c4e3ddc9
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/account.ts
@@ -0,0 +1,12 @@
+export class Account {
+  id: string;
+  name: string;
+  username: string;
+  password: string;
+  url: string;
+  path: string;
+  notes: string;
+  totp: string;
+  isFavorite: boolean;
+  isShared: boolean;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/chunk.ts b/libs/importer/src/importers/lastpass/access/models/chunk.ts
new file mode 100644
index 00000000000..8db56d5030a
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/chunk.ts
@@ -0,0 +1,4 @@
+export class Chunk {
+  id: string;
+  payload: Uint8Array;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/client-info.ts b/libs/importer/src/importers/lastpass/access/models/client-info.ts
new file mode 100644
index 00000000000..275cdc00d3f
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/client-info.ts
@@ -0,0 +1,7 @@
+import { Platform } from "../enums";
+
+export class ClientInfo {
+  platform: Platform;
+  id: string;
+  description: string;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/federated-user-context.ts b/libs/importer/src/importers/lastpass/access/models/federated-user-context.ts
new file mode 100644
index 00000000000..7f56a695d95
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/federated-user-context.ts
@@ -0,0 +1,6 @@
+export class FederatedUserContext {
+  username: string;
+  idpUserInfo: any;
+  accessToken: string;
+  idToken: string;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/index.ts b/libs/importer/src/importers/lastpass/access/models/index.ts
new file mode 100644
index 00000000000..a0c6121a354
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/index.ts
@@ -0,0 +1,10 @@
+export { Account } from "./account";
+export { Chunk } from "./chunk";
+export { ClientInfo } from "./client-info";
+export { FederatedUserContext } from "./federated-user-context";
+export { OobResult } from "./oob-result";
+export { OtpResult } from "./otp-result";
+export { ParserOptions } from "./parser-options";
+export { Session } from "./session";
+export { SharedFolder } from "./shared-folder";
+export { UserTypeContext } from "./user-type-context";
diff --git a/libs/importer/src/importers/lastpass/access/models/oob-result.ts b/libs/importer/src/importers/lastpass/access/models/oob-result.ts
new file mode 100644
index 00000000000..ddd8b0d9671
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/oob-result.ts
@@ -0,0 +1,17 @@
+export class OobResult {
+  static cancel = new OobResult(false, "cancel", false);
+
+  constructor(
+    public waitForOutOfBand: boolean,
+    public passcode: string,
+    public rememberMe: boolean
+  ) {}
+
+  waitForApproval(rememberMe: boolean) {
+    return new OobResult(true, "", rememberMe);
+  }
+
+  continueWithPasscode(passcode: string, rememberMe: boolean) {
+    return new OobResult(false, passcode, rememberMe);
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/otp-result.ts b/libs/importer/src/importers/lastpass/access/models/otp-result.ts
new file mode 100644
index 00000000000..52c2c565f65
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/otp-result.ts
@@ -0,0 +1,5 @@
+export class OtpResult {
+  static cancel = new OtpResult("cancel", false);
+
+  constructor(public passcode: string, public rememberMe: boolean) {}
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/parser-options.ts b/libs/importer/src/importers/lastpass/access/models/parser-options.ts
new file mode 100644
index 00000000000..bdda099fb37
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/parser-options.ts
@@ -0,0 +1,4 @@
+export class ParserOptions {
+  static default: ParserOptions = new ParserOptions();
+  parseSecureNotesToAccount = true;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/session.ts b/libs/importer/src/importers/lastpass/access/models/session.ts
new file mode 100644
index 00000000000..f691968a7a7
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/session.ts
@@ -0,0 +1,9 @@
+import { Platform } from "../enums";
+
+export class Session {
+  id: string;
+  keyIterationCount: number;
+  token: string;
+  platform: Platform;
+  encryptedPrivateKey: string;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/shared-folder.ts b/libs/importer/src/importers/lastpass/access/models/shared-folder.ts
new file mode 100644
index 00000000000..a9d3eb13468
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/shared-folder.ts
@@ -0,0 +1,5 @@
+export class SharedFolder {
+  id: string;
+  name: string;
+  encryptionKey: Uint8Array;
+}
diff --git a/libs/importer/src/importers/lastpass/access/models/user-type-context.ts b/libs/importer/src/importers/lastpass/access/models/user-type-context.ts
new file mode 100644
index 00000000000..9d849281c2d
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/models/user-type-context.ts
@@ -0,0 +1,26 @@
+import { IdpProvider, LastpassLoginType } from "../enums";
+
+export class UserTypeContext {
+  type: LastpassLoginType;
+  IdentityProviderGUID: string;
+  IdentityProviderURL: string;
+  OpenIDConnectAuthority: string;
+  OpenIDConnectClientId: string;
+  CompanyId: number;
+  Provider: IdpProvider;
+  PkceEnabled: boolean;
+  IsPasswordlessEnabled: boolean;
+
+  isFederated(): boolean {
+    return (
+      this.type === LastpassLoginType.Federated &&
+      this.hasValue(this.IdentityProviderURL) &&
+      this.hasValue(this.OpenIDConnectAuthority) &&
+      this.hasValue(this.OpenIDConnectClientId)
+    );
+  }
+
+  private hasValue(str: string) {
+    return str != null && str.trim() !== "";
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/services/binary-reader.ts b/libs/importer/src/importers/lastpass/access/services/binary-reader.ts
new file mode 100644
index 00000000000..e7a434e957f
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/binary-reader.ts
@@ -0,0 +1,76 @@
+export class BinaryReader {
+  private position: number;
+  private isLittleEndian: boolean;
+
+  constructor(public arr: Uint8Array) {
+    this.position = 0;
+
+    const uInt32 = new Uint32Array([0x11223344]);
+    const uInt8 = new Uint8Array(uInt32.buffer);
+    this.isLittleEndian = uInt8[0] === 0x44;
+  }
+
+  readBytes(count: number): Uint8Array {
+    if (this.position + count > this.arr.length) {
+      throw new Error("End of array reached");
+    }
+    const slice = this.arr.subarray(this.position, this.position + count);
+    this.position += count;
+    return slice;
+  }
+
+  readUInt16(): number {
+    const slice = this.readBytes(2);
+    const int = slice[0] | (slice[1] << 8);
+    // Convert to unsigned int
+    return int >>> 0;
+  }
+
+  readUInt32(): number {
+    const slice = this.readBytes(4);
+    const int = slice[0] | (slice[1] << 8) | (slice[2] << 16) | (slice[3] << 24);
+    // Convert to unsigned int
+    return int >>> 0;
+  }
+
+  readUInt16BigEndian(): number {
+    let result = this.readUInt16();
+    if (this.isLittleEndian) {
+      // Extract the two bytes
+      const byte1 = result & 0xff;
+      const byte2 = (result >> 8) & 0xff;
+      // Create a big-endian value by swapping the bytes
+      result = (byte1 << 8) | byte2;
+    }
+    return result;
+  }
+
+  readUInt32BigEndian(): number {
+    let result = this.readUInt32();
+    if (this.isLittleEndian) {
+      // Extract individual bytes
+      const byte1 = (result >> 24) & 0xff;
+      const byte2 = (result >> 16) & 0xff;
+      const byte3 = (result >> 8) & 0xff;
+      const byte4 = result & 0xff;
+      // Create a big-endian value by reordering the bytes
+      result = (byte4 << 24) | (byte3 << 16) | (byte2 << 8) | byte1;
+    }
+    return result;
+  }
+
+  seekFromCurrentPosition(offset: number) {
+    const newPosition = this.position + offset;
+    if (newPosition < 0) {
+      throw new Error("Position cannot be negative");
+    }
+    if (newPosition > this.arr.length) {
+      throw new Error("Array not large enough to seek to this position");
+    }
+    this.position = newPosition;
+  }
+
+  atEnd(): boolean {
+    return this.position >= this.arr.length - 1;
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/services/client.ts b/libs/importer/src/importers/lastpass/access/services/client.ts
new file mode 100644
index 00000000000..2d8b503f01d
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/client.ts
@@ -0,0 +1,549 @@
+import { HttpStatusCode } from "@bitwarden/common/enums";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { OtpMethod, Platform } from "../enums";
+import {
+  Account,
+  Chunk,
+  ClientInfo,
+  OobResult,
+  OtpResult,
+  ParserOptions,
+  Session,
+  SharedFolder,
+} from "../models";
+import { Ui } from "../ui";
+
+import { BinaryReader } from "./binary-reader";
+import { CryptoUtils } from "./crypto-utils";
+import { Parser } from "./parser";
+import { RestClient } from "./rest-client";
+
+const PlatformToUserAgent = new Map<Platform, string>([
+  [Platform.Desktop, "cli"],
+  [Platform.Mobile, "android"],
+]);
+
+const KnownOtpMethods = new Map<string, OtpMethod>([
+  ["googleauthrequired", OtpMethod.GoogleAuth],
+  ["microsoftauthrequired", OtpMethod.MicrosoftAuth],
+  ["otprequired", OtpMethod.Yubikey],
+]);
+
+export class Client {
+  constructor(private parser: Parser, private cryptoUtils: CryptoUtils) {}
+
+  async openVault(
+    username: string,
+    password: string,
+    clientInfo: ClientInfo,
+    ui: Ui,
+    options: ParserOptions
+  ): Promise<Account[]> {
+    const lowercaseUsername = username.toLowerCase();
+    const [session, rest] = await this.login(lowercaseUsername, password, clientInfo, ui);
+    try {
+      const blob = await this.downloadVault(session, rest);
+      const key = await this.cryptoUtils.deriveKey(
+        lowercaseUsername,
+        password,
+        session.keyIterationCount
+      );
+
+      let privateKey: Uint8Array = null;
+      if (session.encryptedPrivateKey != null && session.encryptedPrivateKey != "") {
+        privateKey = await this.parser.parseEncryptedPrivateKey(session.encryptedPrivateKey, key);
+      }
+
+      return this.parseVault(blob, key, privateKey, options);
+    } finally {
+      await this.logout(session, rest);
+    }
+  }
+
+  private async parseVault(
+    blob: Uint8Array,
+    encryptionKey: Uint8Array,
+    privateKey: Uint8Array,
+    options: ParserOptions
+  ): Promise<Account[]> {
+    const reader = new BinaryReader(blob);
+    const chunks = this.parser.extractChunks(reader);
+    if (!this.isComplete(chunks)) {
+      throw new Error("Blob is truncated or corrupted");
+    }
+    return await this.parseAccounts(chunks, encryptionKey, privateKey, options);
+  }
+
+  private async parseAccounts(
+    chunks: Chunk[],
+    encryptionKey: Uint8Array,
+    privateKey: Uint8Array,
+    options: ParserOptions
+  ): Promise<Account[]> {
+    const accounts = new Array<Account>();
+    let folder: SharedFolder = null;
+    for (const chunk of chunks) {
+      if (chunk.id === "ACCT") {
+        const key = folder == null ? encryptionKey : folder.encryptionKey;
+        const account = await this.parser.parseAcct(chunk, key, folder, options);
+        if (account != null) {
+          accounts.push(account);
+        }
+      } else if (chunk.id === "SHAR") {
+        folder = await this.parser.parseShar(chunk, encryptionKey, privateKey);
+      }
+    }
+    return accounts;
+  }
+
+  private isComplete(chunks: Chunk[]): boolean {
+    if (chunks.length > 0 && chunks[chunks.length - 1].id === "ENDM") {
+      const okChunk = Utils.fromBufferToUtf8(chunks[chunks.length - 1].payload);
+      return okChunk === "OK";
+    }
+    return false;
+  }
+
+  private async login(
+    username: string,
+    password: string,
+    clientInfo: ClientInfo,
+    ui: Ui
+  ): Promise<[Session, RestClient]> {
+    const rest = new RestClient();
+    rest.baseUrl = "https://lastpass.com";
+
+    /*
+    1. First we need to request PBKDF2 key iteration count.
+    
+    We no longer request the iteration count from the server in a separate request because it
+    started to fail in weird ways. It seems there's a special combination or the UA and cookies
+    that returns the correct result. And that is not 100% reliable. After two or three attempts
+    it starts to fail again with an incorrect result.
+    
+    So we just went back a few years to the original way LastPass used to handle the iterations.
+    Namely, submit the default value and if it fails, the error would contain the correct value:
+    <response><error iterations="5000" /></response>
+    */
+    let keyIterationCount = 100_100;
+
+    let response: Document = null;
+    let session: Session = null;
+
+    // We have a maximum of 3 retries in case we need to try again with the correct domain and/or
+    // the number of KDF iterations the second/third time around.
+    for (let i = 0; i < 3; i++) {
+      // 2. Knowing the iterations count we can hash the password and log in.
+      // On the first attempt simply with the username and password.
+      response = await this.performSingleLoginRequest(
+        username,
+        password,
+        keyIterationCount,
+        new Map<string, any>(),
+        clientInfo,
+        rest
+      );
+
+      session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo);
+      if (session != null) {
+        return [session, rest];
+      }
+
+      // It's possible we're being redirected to another region.
+      const server = this.getOptionalErrorAttribute(response, "server");
+      if (server != null && server.trim() != "") {
+        rest.baseUrl = "https://" + server;
+        continue;
+      }
+
+      // It's possible for the request above to come back with the correct iteration count.
+      // In this case we have to parse and repeat.
+      const correctIterationCount = this.getOptionalErrorAttribute(response, "iterations");
+      if (correctIterationCount == null) {
+        break;
+      }
+
+      try {
+        keyIterationCount = parseInt(correctIterationCount);
+      } catch {
+        throw (
+          "Failed to parse the iteration count, expected an integer value '" +
+          correctIterationCount +
+          "'"
+        );
+      }
+    }
+
+    // 3. The simple login failed. This is usually due to some error, invalid credentials or
+    // a multifactor authentication being enabled.
+    const cause = this.getOptionalErrorAttribute(response, "cause");
+    if (cause == null) {
+      throw this.makeLoginError(response);
+    }
+
+    const optMethod = KnownOtpMethods.get(cause);
+    if (optMethod != null) {
+      // 3.1. One-time-password is required
+      session = await this.loginWithOtp(
+        username,
+        password,
+        keyIterationCount,
+        optMethod,
+        clientInfo,
+        ui,
+        rest
+      );
+    } else if (cause === "outofbandrequired") {
+      // 3.2. Some out-of-bound authentication is enabled. This does not require any
+      // additional input from the user.
+      session = await this.loginWithOob(
+        username,
+        password,
+        keyIterationCount,
+        this.getAllErrorAttributes(response),
+        clientInfo,
+        ui,
+        rest
+      );
+    }
+
+    // Nothing worked
+    if (session == null) {
+      throw this.makeLoginError(response);
+    }
+
+    // All good
+    return [session, rest];
+  }
+
+  private async loginWithOtp(
+    username: string,
+    password: string,
+    keyIterationCount: number,
+    method: OtpMethod,
+    clientInfo: ClientInfo,
+    ui: Ui,
+    rest: RestClient
+  ): Promise<Session> {
+    let passcode: OtpResult = null;
+    switch (method) {
+      case OtpMethod.GoogleAuth:
+        passcode = ui.provideGoogleAuthPasscode();
+        break;
+      case OtpMethod.MicrosoftAuth:
+        passcode = ui.provideMicrosoftAuthPasscode();
+        break;
+      case OtpMethod.Yubikey:
+        passcode = ui.provideYubikeyPasscode();
+        break;
+      default:
+        throw new Error("Invalid OTP method");
+    }
+
+    if (passcode == OtpResult.cancel) {
+      throw new Error("Second factor step is canceled by the user");
+    }
+
+    const response = await this.performSingleLoginRequest(
+      username,
+      password,
+      keyIterationCount,
+      new Map<string, string>([["otp", passcode.passcode]]),
+      clientInfo,
+      rest
+    );
+
+    const session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo);
+    if (session == null) {
+      throw this.makeLoginError(response);
+    }
+    if (passcode.rememberMe) {
+      await this.markDeviceAsTrusted(session, clientInfo, rest);
+    }
+    return session;
+  }
+
+  private async loginWithOob(
+    username: string,
+    password: string,
+    keyIterationCount: number,
+    parameters: Map<string, string>,
+    clientInfo: ClientInfo,
+    ui: Ui,
+    rest: RestClient
+  ): Promise<Session> {
+    const answer = this.approveOob(username, parameters, ui, rest);
+    if (answer == OobResult.cancel) {
+      throw new Error("Out of band step is canceled by the user");
+    }
+
+    const extraParameters = new Map<string, any>();
+    if (answer.waitForOutOfBand) {
+      extraParameters.set("outofbandrequest", 1);
+    } else {
+      extraParameters.set("otp", answer.passcode);
+    }
+
+    let session: Session = null;
+    for (;;) {
+      // In case of the OOB auth the server doesn't respond instantly. This works more like a long poll.
+      // The server times out in about 10 seconds so there's no need to back off.
+      const response = await this.performSingleLoginRequest(
+        username,
+        password,
+        keyIterationCount,
+        extraParameters,
+        clientInfo,
+        rest
+      );
+
+      session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo);
+      if (session != null) {
+        break;
+      }
+
+      if (this.getOptionalErrorAttribute(response, "cause") != "outofbandrequired") {
+        throw this.makeLoginError(response);
+      }
+
+      // Retry
+      extraParameters.set("outofbandretry", "1");
+      extraParameters.set("outofbandretryid", this.getErrorAttribute(response, "retryid"));
+    }
+
+    if (answer.rememberMe) {
+      await this.markDeviceAsTrusted(session, clientInfo, rest);
+    }
+    return session;
+  }
+
+  private approveOob(username: string, parameters: Map<string, string>, ui: Ui, rest: RestClient) {
+    const method = parameters.get("outofbandtype");
+    if (method == null) {
+      throw new Error("Out of band method is not specified");
+    }
+    switch (method) {
+      case "lastpassauth":
+        return ui.approveLastPassAuth();
+      case "duo":
+        return this.approveDuo(username, parameters, ui, rest);
+      case "salesforcehash":
+        return ui.approveSalesforceAuth();
+      default:
+        throw new Error("Out of band method " + method + " is not supported");
+    }
+  }
+
+  private approveDuo(
+    username: string,
+    parameters: Map<string, string>,
+    ui: Ui,
+    rest: RestClient
+  ): OobResult {
+    return parameters.get("preferduowebsdk") == "1"
+      ? this.approveDuoWebSdk(username, parameters, ui, rest)
+      : ui.approveDuo();
+  }
+
+  private approveDuoWebSdk(
+    username: string,
+    parameters: Map<string, string>,
+    ui: Ui,
+    rest: RestClient
+  ): OobResult {
+    // TODO: implement this
+    return OobResult.cancel;
+  }
+
+  private async markDeviceAsTrusted(session: Session, clientInfo: ClientInfo, rest: RestClient) {
+    const parameters = new Map<string, string>([
+      ["uuid", clientInfo.id],
+      ["trustlabel", clientInfo.description],
+      ["token", session.token],
+    ]);
+    const response = await rest.postForm(
+      "trust.php",
+      parameters,
+      null,
+      this.getSessionCookies(session)
+    );
+    if (response.status == HttpStatusCode.Ok) {
+      return;
+    }
+    this.makeError(response);
+  }
+
+  private async logout(session: Session, rest: RestClient) {
+    const parameters = new Map<string, any>([
+      ["method", PlatformToUserAgent.get(session.platform)],
+      ["noredirect", 1],
+    ]);
+    const response = await rest.postForm(
+      "logout.php",
+      parameters,
+      null,
+      this.getSessionCookies(session)
+    );
+    if (response.status == HttpStatusCode.Ok) {
+      return;
+    }
+    this.makeError(response);
+  }
+
+  private async downloadVault(session: Session, rest: RestClient): Promise<Uint8Array> {
+    const endpoint =
+      "getaccts.php?mobile=1&b64=1&hash=0.0&hasplugin=3.0.23&requestsrc=" +
+      PlatformToUserAgent.get(session.platform);
+    const response = await rest.get(endpoint, null, this.getSessionCookies(session));
+    if (response.status == HttpStatusCode.Ok) {
+      const b64 = await response.text();
+      return Utils.fromB64ToArray(b64);
+    }
+    this.makeError(response);
+  }
+
+  private getSessionCookies(session: Session) {
+    return new Map<string, string>([["PHPSESSID", encodeURIComponent(session.id)]]);
+  }
+
+  private getErrorAttribute(response: Document, name: string): string {
+    const attr = this.getOptionalErrorAttribute(response, name);
+    if (attr != null) {
+      return attr;
+    }
+    throw new Error("Unknown response schema: attribute " + name + " is missing");
+  }
+
+  private getOptionalErrorAttribute(response: Document, name: string): string {
+    const error = response.querySelector("response > error");
+    if (error == null) {
+      return null;
+    }
+    const attr = error.attributes.getNamedItem(name);
+    if (attr == null) {
+      return null;
+    }
+    return attr.value;
+  }
+
+  private getAllErrorAttributes(response: Document): Map<string, string> {
+    const error = response.querySelector("response > error");
+    if (error == null) {
+      return null;
+    }
+    const map = new Map<string, string>();
+    for (const attr of Array.from(error.attributes)) {
+      map.set(attr.name, attr.value);
+    }
+    return map;
+  }
+
+  private extractSessionFromLoginResponse(
+    response: Document,
+    keyIterationCount: number,
+    clientInfo: ClientInfo
+  ): Session {
+    const ok = response.querySelector("response > ok");
+    if (ok == null) {
+      return null;
+    }
+    const sessionId = ok.attributes.getNamedItem("sessionid");
+    if (sessionId == null) {
+      return null;
+    }
+    const token = ok.attributes.getNamedItem("token");
+    if (token == null) {
+      return null;
+    }
+
+    const session = new Session();
+    session.id = sessionId.value;
+    session.keyIterationCount = keyIterationCount;
+    session.token = token.value;
+    session.platform = clientInfo.platform;
+    const privateKey = ok.attributes.getNamedItem("privatekeyenc");
+    if (privateKey != null && privateKey.value != null && privateKey.value.trim() != "") {
+      session.encryptedPrivateKey = privateKey.value;
+    }
+
+    return session;
+  }
+
+  private async performSingleLoginRequest(
+    username: string,
+    password: string,
+    keyIterationCount: number,
+    extraParameters: Map<string, any>,
+    clientInfo: ClientInfo,
+    rest: RestClient
+  ) {
+    const hash = await this.cryptoUtils.deriveKeyHash(username, password, keyIterationCount);
+
+    const parameters = new Map<string, any>([
+      ["method", PlatformToUserAgent.get(clientInfo.platform)],
+      ["xml", "2"],
+      ["username", username],
+      ["hash", Utils.fromBufferToHex(hash.buffer)],
+      ["iterations", keyIterationCount],
+      ["includeprivatekeyenc", "1"],
+      ["outofbandsupported", "1"],
+      ["uuid", clientInfo.id],
+      // TODO: Test against the real server if it's ok to send this every time!
+      ["trustlabel", clientInfo.description],
+    ]);
+    for (const [key, value] of extraParameters) {
+      parameters.set(key, value);
+    }
+
+    const response = await rest.postForm("login.php", parameters);
+    if (response.status == HttpStatusCode.Ok) {
+      const text = await response.text();
+      const domParser = new window.DOMParser();
+      return domParser.parseFromString(text, "text/xml");
+    }
+    this.makeError(response);
+  }
+
+  private makeError(response: Response) {
+    // TODO: error parsing
+    throw new Error(
+      "HTTP request to " + response.url + " failed with status " + response.status + "."
+    );
+  }
+
+  private makeLoginError(response: Document): string {
+    const error = response.querySelector("response > error");
+    if (error == null) {
+      return "Unknown response schema";
+    }
+
+    const cause = error.attributes.getNamedItem("cause");
+    const message = error.attributes.getNamedItem("message");
+
+    if (cause != null) {
+      switch (cause.value) {
+        case "unknownemail":
+          return "Invalid username";
+        case "unknownpassword":
+          return "Invalid password";
+        case "googleauthfailed":
+        case "microsoftauthfailed":
+        case "otpfailed":
+          return "Second factor code is incorrect";
+        case "multifactorresponsefailed":
+          return "Out of band authentication failed";
+        default:
+          return message?.value ?? cause.value;
+      }
+    }
+
+    // No cause, maybe at least a message
+    if (message != null) {
+      return message.value;
+    }
+
+    // Nothing we know, just the error element
+    return "Unknown error";
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts b/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts
new file mode 100644
index 00000000000..4de046f2aa3
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts
@@ -0,0 +1,118 @@
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+export class CryptoUtils {
+  constructor(private cryptoFunctionService: CryptoFunctionService) {}
+
+  async deriveKey(username: string, password: string, iterationCount: number) {
+    if (iterationCount < 0) {
+      throw new Error("Iteration count should be positive");
+    }
+    if (iterationCount == 1) {
+      return await this.cryptoFunctionService.hash(username + password, "sha256");
+    }
+    return await this.cryptoFunctionService.pbkdf2(password, username, "sha256", iterationCount);
+  }
+
+  async deriveKeyHash(username: string, password: string, iterationCount: number) {
+    const key = await this.deriveKey(username, password, iterationCount);
+    if (iterationCount == 1) {
+      return await this.cryptoFunctionService.hash(
+        Utils.fromBufferToHex(key.buffer) + password,
+        "sha256"
+      );
+    }
+    return await this.cryptoFunctionService.pbkdf2(key, password, "sha256", 1);
+  }
+
+  ExclusiveOr(arr1: Uint8Array, arr2: Uint8Array) {
+    if (arr1.length !== arr2.length) {
+      throw new Error("Arrays must be the same length.");
+    }
+    const result = new Uint8Array(arr1.length);
+    for (let i = 0; i < arr1.length; i++) {
+      result[i] = arr1[i] ^ arr2[i];
+    }
+    return result;
+  }
+
+  async decryptAes256PlainWithDefault(
+    data: Uint8Array,
+    encryptionKey: Uint8Array,
+    defaultValue: string
+  ) {
+    try {
+      return this.decryptAes256Plain(data, encryptionKey);
+    } catch {
+      return defaultValue;
+    }
+  }
+
+  async decryptAes256Base64WithDefault(
+    data: Uint8Array,
+    encryptionKey: Uint8Array,
+    defaultValue: string
+  ) {
+    try {
+      return this.decryptAes256Base64(data, encryptionKey);
+    } catch {
+      return defaultValue;
+    }
+  }
+
+  async decryptAes256Plain(data: Uint8Array, encryptionKey: Uint8Array) {
+    if (data.length === 0) {
+      return "";
+    }
+    // Byte 33 == character '!'
+    if (data[0] === 33 && data.length % 16 === 1 && data.length > 32) {
+      return this.decryptAes256CbcPlain(data, encryptionKey);
+    }
+    return this.decryptAes256EcbPlain(data, encryptionKey);
+  }
+
+  async decryptAes256Base64(data: Uint8Array, encryptionKey: Uint8Array) {
+    if (data.length === 0) {
+      return "";
+    }
+    // Byte 33 == character '!'
+    if (data[0] === 33) {
+      return this.decryptAes256CbcBase64(data, encryptionKey);
+    }
+    return this.decryptAes256EcbBase64(data, encryptionKey);
+  }
+
+  async decryptAes256(
+    data: Uint8Array,
+    encryptionKey: Uint8Array,
+    mode: "cbc" | "ecb",
+    iv: Uint8Array = new Uint8Array(16)
+  ): Promise<string> {
+    if (data.length === 0) {
+      return "";
+    }
+    const plain = await this.cryptoFunctionService.aesDecrypt(data, iv, encryptionKey, mode);
+    return Utils.fromBufferToUtf8(plain);
+  }
+
+  private async decryptAes256EcbPlain(data: Uint8Array, encryptionKey: Uint8Array) {
+    return this.decryptAes256(data, encryptionKey, "ecb");
+  }
+
+  private async decryptAes256EcbBase64(data: Uint8Array, encryptionKey: Uint8Array) {
+    const d = Utils.fromB64ToArray(Utils.fromBufferToUtf8(data));
+    return this.decryptAes256(d, encryptionKey, "ecb");
+  }
+
+  private async decryptAes256CbcPlain(data: Uint8Array, encryptionKey: Uint8Array) {
+    const d = data.subarray(17);
+    const iv = data.subarray(1, 17);
+    return this.decryptAes256(d, encryptionKey, "cbc", iv);
+  }
+
+  private async decryptAes256CbcBase64(data: Uint8Array, encryptionKey: Uint8Array) {
+    const d = Utils.fromB64ToArray(Utils.fromBufferToUtf8(data.subarray(26)));
+    const iv = Utils.fromB64ToArray(Utils.fromBufferToUtf8(data.subarray(1, 25)));
+    return this.decryptAes256(d, encryptionKey, "cbc", iv);
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/services/index.ts b/libs/importer/src/importers/lastpass/access/services/index.ts
new file mode 100644
index 00000000000..2610efdb694
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/index.ts
@@ -0,0 +1,5 @@
+export { BinaryReader } from "./binary-reader";
+export { Client } from "./client";
+export { CryptoUtils } from "./crypto-utils";
+export { Parser } from "./parser";
+export { RestClient } from "./rest-client";
diff --git a/libs/importer/src/importers/lastpass/access/services/parser.ts b/libs/importer/src/importers/lastpass/access/services/parser.ts
new file mode 100644
index 00000000000..3d64490be12
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/parser.ts
@@ -0,0 +1,357 @@
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { Account, Chunk, ParserOptions, SharedFolder } from "../models";
+
+import { BinaryReader } from "./binary-reader";
+import { CryptoUtils } from "./crypto-utils";
+
+const AllowedSecureNoteTypes = new Set<string>([
+  "Server",
+  "Email Account",
+  "Database",
+  "Instant Messenger",
+]);
+
+export class Parser {
+  constructor(
+    private cryptoFunctionService: CryptoFunctionService,
+    private cryptoUtils: CryptoUtils
+  ) {}
+
+  /*
+  May return null when the chunk does not represent an account.
+  All secure notes are ACCTs but not all of them store account information.
+  
+  TODO: Add a test for the folder case!
+  TODO: Add a test case that covers secure note account!
+  */
+  async parseAcct(
+    chunk: Chunk,
+    encryptionKey: Uint8Array,
+    folder: SharedFolder,
+    options: ParserOptions
+  ): Promise<Account> {
+    const placeholder = "decryption failed";
+    const reader = new BinaryReader(chunk.payload);
+
+    // Read all items
+    // 0: id
+    const id = Utils.fromBufferToUtf8(this.readItem(reader));
+
+    // 1: name
+    const name = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 2: group
+    const group = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 3: url
+    let url = Utils.fromBufferToUtf8(
+      Utils.fromHexToArray(Utils.fromBufferToUtf8(this.readItem(reader)))
+    );
+
+    // Ignore "group" accounts. They have no credentials.
+    if (url == "http://group") {
+      return null;
+    }
+
+    // 4: extra (notes)
+    const notes = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 5: fav (is favorite)
+    const isFavorite = Utils.fromBufferToUtf8(this.readItem(reader)) === "1";
+
+    // 6: sharedfromaid (?)
+    this.skipItem(reader);
+
+    // 7: username
+    let username = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 8: password
+    let password = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 9: pwprotect (?)
+    this.skipItem(reader);
+
+    // 10: genpw (?)
+    this.skipItem(reader);
+
+    // 11: sn (is secure note)
+    const isSecureNote = Utils.fromBufferToUtf8(this.readItem(reader)) === "1";
+
+    // Parse secure note
+    if (options.parseSecureNotesToAccount && isSecureNote) {
+      let type = "";
+      // ParseSecureNoteServer
+      for (const i of notes.split("\n")) {
+        const keyValue = i.split(":", 2);
+        if (keyValue.length < 2) {
+          continue;
+        }
+        switch (keyValue[0]) {
+          case "NoteType":
+            type = keyValue[1];
+            break;
+          case "Hostname":
+            url = keyValue[1];
+            break;
+          case "Username":
+            username = keyValue[1];
+            break;
+          case "Password":
+            password = keyValue[1];
+            break;
+        }
+      }
+
+      // Only the some secure notes contain account-like information
+      if (!AllowedSecureNoteTypes.has(type)) {
+        return null;
+      }
+    }
+
+    // 12: last_touch_gmt (?)
+    this.skipItem(reader);
+
+    // 13: autologin (?)
+    this.skipItem(reader);
+
+    // 14: never_autofill (?)
+    this.skipItem(reader);
+
+    // 15: realm (?)
+    this.skipItem(reader);
+
+    // 16: id_again (?)
+    this.skipItem(reader);
+
+    // 17: custom_js (?)
+    this.skipItem(reader);
+
+    // 18: submit_id (?)
+    this.skipItem(reader);
+
+    // 19: captcha_id (?)
+    this.skipItem(reader);
+
+    // 20: urid (?)
+    this.skipItem(reader);
+
+    // 21: basic_auth (?)
+    this.skipItem(reader);
+
+    // 22: method (?)
+    this.skipItem(reader);
+
+    // 23: action (?)
+    this.skipItem(reader);
+
+    // 24: groupid (?)
+    this.skipItem(reader);
+
+    // 25: deleted (?)
+    this.skipItem(reader);
+
+    // 26: attachkey (?)
+    this.skipItem(reader);
+
+    // 27: attachpresent (?)
+    this.skipItem(reader);
+
+    // 28: individualshare (?)
+    this.skipItem(reader);
+
+    // 29: notetype (?)
+    this.skipItem(reader);
+
+    // 30: noalert (?)
+    this.skipItem(reader);
+
+    // 31: last_modified_gmt (?)
+    this.skipItem(reader);
+
+    // 32: hasbeenshared (?)
+    this.skipItem(reader);
+
+    // 33: last_pwchange_gmt (?)
+    this.skipItem(reader);
+
+    // 34: created_gmt (?)
+    this.skipItem(reader);
+
+    // 35: vulnerable (?)
+    this.skipItem(reader);
+
+    // 36: pwch (?)
+    this.skipItem(reader);
+
+    // 37: breached (?)
+    this.skipItem(reader);
+
+    // 38: template (?)
+    this.skipItem(reader);
+
+    // 39: totp (?)
+    const totp = await this.cryptoUtils.decryptAes256PlainWithDefault(
+      this.readItem(reader),
+      encryptionKey,
+      placeholder
+    );
+
+    // 3 more left. Don't even bother skipping them.
+
+    // 40: trustedHostnames (?)
+    // 41: last_credential_monitoring_gmt (?)
+    // 42: last_credential_monitoring_stat (?)
+
+    // Adjust the path to include the group and the shared folder, if any.
+    const path = this.makeAccountPath(group, folder);
+
+    const account = new Account();
+    account.id = id;
+    account.name = name;
+    account.username = username;
+    account.password = password;
+    account.url = url;
+    account.path = path;
+    account.notes = notes;
+    account.totp = totp;
+    account.isFavorite = isFavorite;
+    account.isShared = folder != null;
+    return account;
+  }
+
+  async parseShar(
+    chunk: Chunk,
+    encryptionKey: Uint8Array,
+    rsaKey: Uint8Array
+  ): Promise<SharedFolder> {
+    const reader = new BinaryReader(chunk.payload);
+
+    // Id
+    const id = Utils.fromBufferToUtf8(this.readItem(reader));
+
+    // Key
+    const folderKey = this.readItem(reader);
+    const rsaEncryptedFolderKey = Utils.fromHexToArray(Utils.fromBufferToUtf8(folderKey));
+    const decFolderKey = await this.cryptoFunctionService.rsaDecrypt(
+      rsaEncryptedFolderKey,
+      rsaKey,
+      "sha1"
+    );
+    const key = Utils.fromHexToArray(Utils.fromBufferToUtf8(decFolderKey));
+
+    // Name
+    const encryptedName = this.readItem(reader);
+    const name = await this.cryptoUtils.decryptAes256Base64(encryptedName, key);
+
+    const folder = new SharedFolder();
+    folder.id = id;
+    folder.name = name;
+    folder.encryptionKey = key;
+    return folder;
+  }
+
+  async parseEncryptedPrivateKey(encryptedPrivateKey: string, encryptionKey: Uint8Array) {
+    const decrypted = await this.cryptoUtils.decryptAes256(
+      Utils.fromHexToArray(encryptedPrivateKey),
+      encryptionKey,
+      "cbc",
+      encryptionKey.subarray(0, 16)
+    );
+
+    const header = "LastPassPrivateKey<";
+    const footer = ">LastPassPrivateKey";
+    if (!decrypted.startsWith(header) || !decrypted.endsWith(footer)) {
+      throw new Error("Failed to decrypt private key");
+    }
+
+    const parsedKey = decrypted.substring(header.length, decrypted.length - footer.length);
+    const pkcs8 = Utils.fromHexToArray(parsedKey);
+    return pkcs8;
+  }
+
+  makeAccountPath(group: string, folder: SharedFolder): string {
+    const groupEmpty = group == null || group.trim() === "";
+    if (folder == null) {
+      return groupEmpty ? "(none)" : group;
+    }
+    return groupEmpty ? folder.name : folder.name + "\\" + group;
+  }
+
+  extractChunks(reader: BinaryReader): Chunk[] {
+    const chunks = new Array<Chunk>();
+    while (!reader.atEnd()) {
+      const chunk = this.readChunk(reader);
+      chunks.push(chunk);
+
+      // TODO: catch end of stream exception?
+      // In case the stream is truncated we just ignore the incomplete chunk.
+    }
+    return chunks;
+  }
+
+  private readChunk(reader: BinaryReader): Chunk {
+    /*
+    LastPass blob chunk is made up of 4-byte ID, big endian 4-byte size and payload of that size
+    Example:
+      0000: 'IDID'
+      0004: 4
+      0008: 0xDE 0xAD 0xBE 0xEF
+      000C: --- Next chunk ---
+    */
+    const chunk = new Chunk();
+    chunk.id = this.readId(reader);
+    chunk.payload = this.readPayload(reader, this.readSize(reader));
+    return chunk;
+  }
+
+  private readItem(reader: BinaryReader): Uint8Array {
+    /*
+    An item in an itemized chunk is made up of the big endian size and the payload of that size
+    Example:
+      0000: 4
+      0004: 0xDE 0xAD 0xBE 0xEF
+      0008: --- Next item ---
+    See readItem for item description.
+    */
+    return this.readPayload(reader, this.readSize(reader));
+  }
+
+  private skipItem(reader: BinaryReader): void {
+    // See readItem for item description.
+    reader.seekFromCurrentPosition(this.readSize(reader));
+  }
+
+  private readId(reader: BinaryReader): string {
+    return Utils.fromBufferToUtf8(reader.readBytes(4));
+  }
+
+  private readSize(reader: BinaryReader): number {
+    return reader.readUInt32BigEndian();
+  }
+
+  private readPayload(reader: BinaryReader, size: number): Uint8Array {
+    return reader.readBytes(size);
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/services/rest-client.ts b/libs/importer/src/importers/lastpass/access/services/rest-client.ts
new file mode 100644
index 00000000000..b26109d8e87
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/services/rest-client.ts
@@ -0,0 +1,99 @@
+export class RestClient {
+  baseUrl: string;
+  isBrowser = true;
+
+  async get(
+    endpoint: string,
+    headers: Map<string, string> = null,
+    cookies: Map<string, string> = null
+  ): Promise<Response> {
+    const requestInit: RequestInit = {
+      method: "GET",
+      credentials: "include",
+    };
+    this.setHeaders(requestInit, headers, cookies);
+    const request = new Request(this.baseUrl + "/" + endpoint, requestInit);
+    const response = await fetch(request);
+    return response;
+  }
+
+  async postForm(
+    endpoint: string,
+    parameters: Map<string, any> = null,
+    headers: Map<string, string> = null,
+    cookies: Map<string, string> = null
+  ): Promise<Response> {
+    const setBody = (requestInit: RequestInit, headerMap: Map<string, string>) => {
+      if (parameters != null && parameters.size > 0) {
+        const form = new FormData();
+        for (const [key, value] of parameters) {
+          form.set(key, value);
+        }
+        requestInit.body = form;
+      }
+    };
+    return await this.post(endpoint, setBody, headers, cookies);
+  }
+
+  async postJson(
+    endpoint: string,
+    body: any,
+    headers: Map<string, string> = null,
+    cookies: Map<string, string> = null
+  ): Promise<Response> {
+    const setBody = (requestInit: RequestInit, headerMap: Map<string, string>) => {
+      if (body != null) {
+        if (headerMap == null) {
+          headerMap = new Map<string, string>();
+        }
+        headerMap.set("Content-Type", "application/json; charset=utf-8");
+        requestInit.body = JSON.stringify(body);
+      }
+    };
+    return await this.post(endpoint, setBody, headers, cookies);
+  }
+
+  private async post(
+    endpoint: string,
+    setBody: (requestInit: RequestInit, headers: Map<string, string>) => void,
+    headers: Map<string, string> = null,
+    cookies: Map<string, string> = null
+  ) {
+    const requestInit: RequestInit = {
+      method: "POST",
+      credentials: "include",
+    };
+    setBody(requestInit, headers);
+    this.setHeaders(requestInit, headers, cookies);
+    const request = new Request(this.baseUrl + "/" + endpoint, requestInit);
+    const response = await fetch(request);
+    return response;
+  }
+
+  private setHeaders(
+    requestInit: RequestInit,
+    headers: Map<string, string> = null,
+    cookies: Map<string, string> = null
+  ) {
+    const requestHeaders = new Headers();
+    let setHeaders = false;
+    if (headers != null && headers.size > 0) {
+      setHeaders = true;
+      for (const [key, value] of headers) {
+        requestHeaders.set(key, value);
+      }
+    }
+    // Cookies should be already automatically set for this origin by the browser
+    // TODO: set cookies for non-browser scenarios?
+    if (!this.isBrowser && cookies != null && cookies.size > 0) {
+      setHeaders = true;
+      const cookieString = Array.from(cookies.keys())
+        .map((key) => `${key}=${cookies.get(key)}`)
+        .join("; ");
+      requestHeaders.set("cookie", cookieString);
+    }
+    if (setHeaders) {
+      requestInit.headers = requestHeaders;
+    }
+  }
+}
diff --git a/libs/importer/src/importers/lastpass/access/ui/duo-ui.ts b/libs/importer/src/importers/lastpass/access/ui/duo-ui.ts
new file mode 100644
index 00000000000..60afd0ad9df
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/ui/duo-ui.ts
@@ -0,0 +1,23 @@
+import { DuoFactor, DuoStatus } from "../enums";
+
+// Adds Duo functionality to the module-specific Ui class.
+export abstract class DuoUi {
+  // To cancel return null
+  chooseDuoFactor: (devices: [DuoDevice]) => DuoChoice;
+  // To cancel return null or blank
+  provideDuoPasscode: (device: DuoDevice) => string;
+  // This updates the UI with the messages from the server.
+  updateDuoStatus: (status: DuoStatus, text: string) => void;
+}
+
+export interface DuoChoice {
+  device: DuoDevice;
+  factor: DuoFactor;
+  rememberMe: boolean;
+}
+
+export interface DuoDevice {
+  id: string;
+  name: string;
+  factors: DuoFactor[];
+}
diff --git a/libs/importer/src/importers/lastpass/access/ui/index.ts b/libs/importer/src/importers/lastpass/access/ui/index.ts
new file mode 100644
index 00000000000..e4edc3b6b48
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/ui/index.ts
@@ -0,0 +1,2 @@
+export { DuoUi, DuoChoice, DuoDevice } from "./duo-ui";
+export { Ui } from "./ui";
diff --git a/libs/importer/src/importers/lastpass/access/ui/ui.ts b/libs/importer/src/importers/lastpass/access/ui/ui.ts
new file mode 100644
index 00000000000..2338e8a291e
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/ui/ui.ts
@@ -0,0 +1,29 @@
+import { OobResult, OtpResult } from "../models";
+
+import { DuoUi } from "./duo-ui";
+
+export abstract class Ui extends DuoUi {
+  // To cancel return OtpResult.Cancel, otherwise only valid data is expected.
+  provideGoogleAuthPasscode: () => OtpResult;
+  provideMicrosoftAuthPasscode: () => OtpResult;
+  provideYubikeyPasscode: () => OtpResult;
+
+  /*
+  The UI implementations should provide the following possibilities for the user:
+  
+  1. Cancel. Return OobResult.Cancel to cancel.
+  
+  2. Go through with the out-of-band authentication where a third party app is used to approve or decline
+      the action. In this case return OobResult.waitForApproval(rememberMe). The UI should return as soon
+      as possible to allow the library to continue polling the service. Even though it's possible to return
+      control to the library only after the user performed the out-of-band action, it's not necessary. It
+      could be also done sooner.
+  
+  3. Allow the user to provide the passcode manually. All supported OOB methods allow to enter the
+      passcode instead of performing an action in the app. In this case the UI should return
+      OobResult.continueWithPasscode(passcode, rememberMe).
+  */
+  approveLastPassAuth: () => OobResult;
+  approveDuo: () => OobResult;
+  approveSalesforceAuth: () => OobResult;
+}
diff --git a/libs/importer/src/importers/lastpass/access/vault.ts b/libs/importer/src/importers/lastpass/access/vault.ts
new file mode 100644
index 00000000000..a461239eea8
--- /dev/null
+++ b/libs/importer/src/importers/lastpass/access/vault.ts
@@ -0,0 +1,201 @@
+import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
+import { HttpStatusCode } from "@bitwarden/common/enums";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { IdpProvider } from "./enums";
+import {
+  Account,
+  ClientInfo,
+  FederatedUserContext,
+  ParserOptions,
+  UserTypeContext,
+} from "./models";
+import { Client, CryptoUtils, Parser, RestClient } from "./services";
+import { Ui } from "./ui";
+
+export class Vault {
+  accounts: Account[];
+  userType: UserTypeContext;
+
+  private client: Client;
+  private cryptoUtils: CryptoUtils;
+
+  constructor(
+    private cryptoFunctionService: CryptoFunctionService,
+    private tokenService: TokenService
+  ) {
+    this.cryptoUtils = new CryptoUtils(cryptoFunctionService);
+    const parser = new Parser(cryptoFunctionService, this.cryptoUtils);
+    this.client = new Client(parser, this.cryptoUtils);
+  }
+
+  async open(
+    username: string,
+    password: string,
+    clientInfo: ClientInfo,
+    ui: Ui,
+    parserOptions: ParserOptions = ParserOptions.default
+  ): Promise<void> {
+    this.accounts = await this.client.openVault(username, password, clientInfo, ui, parserOptions);
+  }
+
+  async openFederated(
+    federatedUser: FederatedUserContext,
+    clientInfo: ClientInfo,
+    ui: Ui,
+    parserOptions: ParserOptions = ParserOptions.default
+  ): Promise<void> {
+    if (federatedUser == null) {
+      throw new Error("Federated user context is not set.");
+    }
+    const k1 = await this.getK1(federatedUser);
+    const k2 = await this.getK2(federatedUser);
+    const hiddenPasswordArr = await this.cryptoFunctionService.hash(
+      this.cryptoUtils.ExclusiveOr(k1, k2),
+      "sha256"
+    );
+    const hiddenPassword = Utils.fromBufferToB64(hiddenPasswordArr);
+    await this.open(federatedUser.username, hiddenPassword, clientInfo, ui, parserOptions);
+  }
+
+  async setUserTypeContext(username: string) {
+    const lowercaseUsername = username.toLowerCase();
+    const rest = new RestClient();
+    rest.baseUrl = "https://lastpass.com";
+    const endpoint = "lmiapi/login/type?username=" + encodeURIComponent(lowercaseUsername);
+    const response = await rest.get(endpoint);
+    if (response.status === HttpStatusCode.Ok) {
+      const json = await response.json();
+      this.userType = new UserTypeContext();
+      this.userType.CompanyId = json.CompanyId;
+      this.userType.IdentityProviderGUID = json.IdentityProviderGUID;
+      this.userType.IdentityProviderURL = json.IdentityProviderURL;
+      this.userType.IsPasswordlessEnabled = json.IsPasswordlessEnabled;
+      this.userType.OpenIDConnectAuthority = json.OpenIDConnectAuthority;
+      this.userType.OpenIDConnectClientId = json.OpenIDConnectClientId;
+      this.userType.PkceEnabled = json.PkceEnabled;
+      this.userType.Provider = json.Provider;
+      this.userType.type = json.type;
+      return;
+    }
+    throw new Error("Cannot determine LastPass user type.");
+  }
+
+  private async getK1(federatedUser: FederatedUserContext): Promise<Uint8Array> {
+    if (this.userType == null) {
+      throw new Error("User type is not set.");
+    }
+
+    if (!this.userType.isFederated()) {
+      throw new Error("Cannot get k1 for LastPass user that is not federated.");
+    }
+
+    if (federatedUser == null) {
+      throw new Error("Federated user is not set.");
+    }
+
+    let k1: Uint8Array = null;
+    if (federatedUser.idpUserInfo?.LastPassK1 !== null) {
+      return Utils.fromByteStringToArray(federatedUser.idpUserInfo.LastPassK1);
+    } else if (this.userType.Provider === IdpProvider.Azure) {
+      k1 = await this.getK1Azure(federatedUser);
+    } else if (this.userType.Provider === IdpProvider.Google) {
+      k1 = await this.getK1Google(federatedUser);
+    } else {
+      const b64Encoded = this.userType.Provider === IdpProvider.PingOne;
+      k1 = this.getK1FromAccessToken(federatedUser, b64Encoded);
+    }
+
+    if (k1 !== null) {
+      return k1;
+    }
+
+    throw new Error("Cannot get k1.");
+  }
+
+  private async getK1Azure(federatedUser: FederatedUserContext) {
+    // Query the Graph API for the k1 field
+    const rest = new RestClient();
+    rest.baseUrl = "https://graph.microsoft.com";
+    const response = await rest.get(
+      "v1.0/me?$select=id,displayName,mail&$expand=extensions",
+      new Map([["Authorization", "Bearer " + federatedUser.accessToken]])
+    );
+    if (response.status === HttpStatusCode.Ok) {
+      const json = await response.json();
+      const k1 = json?.extensions?.LastPassK1 as string;
+      if (k1 !== null) {
+        return Utils.fromB64ToArray(k1);
+      }
+    }
+    return null;
+  }
+
+  private async getK1Google(federatedUser: FederatedUserContext) {
+    // Query Google Drive for the k1.lp file
+    const accessTokenAuthHeader = new Map([
+      ["Authorization", "Bearer " + federatedUser.accessToken],
+    ]);
+    const rest = new RestClient();
+    rest.baseUrl = "https://content.googleapis.com";
+    const response = await rest.get(
+      "drive/v3/files?pageSize=1" +
+        "&q=name%20%3D%20%27k1.lp%27" +
+        "&spaces=appDataFolder" +
+        "&fields=nextPageToken%2C%20files(id%2C%20name)",
+      accessTokenAuthHeader
+    );
+    if (response.status === HttpStatusCode.Ok) {
+      const json = await response.json();
+      const files = json?.files as any[];
+      if (files !== null && files.length > 0 && files[0].id != null && files[0].name === "k1.lp") {
+        // Open the k1.lp file
+        rest.baseUrl = "https://www.googleapis.com";
+        const response = await rest.get(
+          "drive/v3/files/" + files[0].id + "?alt=media",
+          accessTokenAuthHeader
+        );
+        if (response.status === HttpStatusCode.Ok) {
+          const k1 = await response.text();
+          return Utils.fromB64ToArray(k1);
+        }
+      }
+    }
+    return null;
+  }
+
+  private getK1FromAccessToken(federatedUser: FederatedUserContext, b64: boolean) {
+    const decodedAccessToken = this.tokenService.decodeToken(federatedUser.accessToken);
+    const k1 = decodedAccessToken?.LastPassK1 as string;
+    if (k1 !== null) {
+      return b64 ? Utils.fromB64ToArray(k1) : Utils.fromByteStringToArray(k1);
+    }
+    return null;
+  }
+
+  private async getK2(federatedUser: FederatedUserContext): Promise<Uint8Array> {
+    if (this.userType == null) {
+      throw new Error("User type is not set.");
+    }
+
+    if (!this.userType.isFederated()) {
+      throw new Error("Cannot get k2 for LastPass user that is not federated.");
+    }
+
+    const rest = new RestClient();
+    rest.baseUrl = this.userType.IdentityProviderURL;
+    const response = await rest.postJson("federatedlogin/api/v1/getkey", {
+      company_id: this.userType.CompanyId,
+      id_token: federatedUser.idToken,
+    });
+    if (response.status === HttpStatusCode.Ok) {
+      const json = await response.json();
+      const k2 = json?.k2 as string;
+      if (k2 !== null) {
+        return Utils.fromB64ToArray(k2);
+      }
+    }
+    throw new Error("Cannot get k2.");
+  }
+}
diff --git a/libs/node/src/services/node-crypto-function.service.spec.ts b/libs/node/src/services/node-crypto-function.service.spec.ts
index 051c45712f8..50c75d639a7 100644
--- a/libs/node/src/services/node-crypto-function.service.spec.ts
+++ b/libs/node/src/services/node-crypto-function.service.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { DecryptParameters } from "@bitwarden/common/platform/models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 
 import { NodeCryptoFunctionService } from "./node-crypto-function.service";
@@ -164,7 +165,7 @@ describe("NodeCrypto Function Service", () => {
     testCompare(true);
   });
 
-  describe("aesEncrypt", () => {
+  describe("aesEncrypt CBC mode", () => {
     it("should successfully encrypt data", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
       const iv = makeStaticByteArray(16);
@@ -181,30 +182,51 @@ describe("NodeCrypto Function Service", () => {
       const value = "EncryptMe!";
       const data = Utils.fromUtf8ToArray(value);
       const encValue = await nodeCryptoFunctionService.aesEncrypt(data, iv, key);
-      const decValue = await nodeCryptoFunctionService.aesDecrypt(encValue, iv, key);
+      const decValue = await nodeCryptoFunctionService.aesDecrypt(encValue, iv, key, "cbc");
       expect(Utils.fromBufferToUtf8(decValue)).toBe(value);
     });
   });
 
-  describe("aesDecryptFast", () => {
+  describe("aesDecryptFast CBC mode", () => {
     it("should successfully decrypt data", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
       const iv = Utils.fromBufferToB64(makeStaticByteArray(16));
       const symKey = new SymmetricCryptoKey(makeStaticByteArray(32));
       const data = "ByUF8vhyX4ddU9gcooznwA==";
       const params = nodeCryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
-      const decValue = await nodeCryptoFunctionService.aesDecryptFast(params);
+      const decValue = await nodeCryptoFunctionService.aesDecryptFast(params, "cbc");
       expect(decValue).toBe("EncryptMe!");
     });
   });
 
-  describe("aesDecrypt", () => {
+  describe("aesDecryptFast ECB mode", () => {
+    it("should successfully decrypt data", async () => {
+      const nodeCryptoFunctionService = new NodeCryptoFunctionService();
+      const params = new DecryptParameters<Uint8Array>();
+      params.encKey = makeStaticByteArray(32);
+      params.data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
+      const decValue = await nodeCryptoFunctionService.aesDecryptFast(params, "ecb");
+      expect(decValue).toBe("EncryptMe!");
+    });
+  });
+
+  describe("aesDecrypt CBC mode", () => {
     it("should successfully decrypt data", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
       const iv = makeStaticByteArray(16);
       const key = makeStaticByteArray(32);
       const data = Utils.fromB64ToArray("ByUF8vhyX4ddU9gcooznwA==");
-      const decValue = await nodeCryptoFunctionService.aesDecrypt(data, iv, key);
+      const decValue = await nodeCryptoFunctionService.aesDecrypt(data, iv, key, "cbc");
+      expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
+    });
+  });
+
+  describe("aesDecrypt ECB mode", () => {
+    it("should successfully decrypt data", async () => {
+      const nodeCryptoFunctionService = new NodeCryptoFunctionService();
+      const key = makeStaticByteArray(32);
+      const data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
+      const decValue = await nodeCryptoFunctionService.aesDecrypt(data, null, key, "ecb");
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
     });
   });
diff --git a/libs/node/src/services/node-crypto-function.service.ts b/libs/node/src/services/node-crypto-function.service.ts
index 9c0e49d00d0..25806352a67 100644
--- a/libs/node/src/services/node-crypto-function.service.ts
+++ b/libs/node/src/services/node-crypto-function.service.ts
@@ -189,16 +189,24 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     return p;
   }
 
-  async aesDecryptFast(parameters: DecryptParameters<Uint8Array>): Promise<string> {
-    const decBuf = await this.aesDecrypt(parameters.data, parameters.iv, parameters.encKey);
+  async aesDecryptFast(
+    parameters: DecryptParameters<Uint8Array>,
+    mode: "cbc" | "ecb"
+  ): Promise<string> {
+    const decBuf = await this.aesDecrypt(parameters.data, parameters.iv, parameters.encKey, mode);
     return Utils.fromBufferToUtf8(decBuf);
   }
 
-  aesDecrypt(data: Uint8Array, iv: Uint8Array, key: Uint8Array): Promise<Uint8Array> {
+  aesDecrypt(
+    data: Uint8Array,
+    iv: Uint8Array,
+    key: Uint8Array,
+    mode: "cbc" | "ecb"
+  ): Promise<Uint8Array> {
     const nodeData = this.toNodeBuffer(data);
-    const nodeIv = this.toNodeBuffer(iv);
+    const nodeIv = mode === "ecb" ? null : this.toNodeBuffer(iv);
     const nodeKey = this.toNodeBuffer(key);
-    const decipher = crypto.createDecipheriv("aes-256-cbc", nodeKey, nodeIv);
+    const decipher = crypto.createDecipheriv(this.toNodeCryptoAesMode(mode), nodeKey, nodeIv);
     const decBuf = Buffer.concat([decipher.update(nodeData), decipher.final()]);
     return Promise.resolve(this.toUint8Buffer(decBuf));
   }
@@ -326,4 +334,8 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     const publicKey = forge.pki.publicKeyFromAsn1(asn1);
     return forge.pki.publicKeyToPem(publicKey);
   }
+
+  private toNodeCryptoAesMode(mode: "cbc" | "ecb"): string {
+    return mode === "cbc" ? "aes-256-cbc" : "aes-256-ecb";
+  }
 }
diff --git a/libs/vault/src/components/password-reprompt.component.html b/libs/vault/src/components/password-reprompt.component.html
new file mode 100644
index 00000000000..4ee1c16238d
--- /dev/null
+++ b/libs/vault/src/components/password-reprompt.component.html
@@ -0,0 +1,31 @@
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-dialog>
+    <span bitDialogTitle>
+      {{ "passwordConfirmation" | i18n }}
+    </span>
+    <ng-container bitDialogContent>
+      {{ "passwordConfirmationDesc" | i18n }}
+
+      <bit-form-field disableMargin class="tw-mt-6">
+        <bit-label>{{ "masterPass" | i18n }}</bit-label>
+        <input
+          bitInput
+          appAutofocus
+          id="masterPassword"
+          type="password"
+          formControlName="masterPassword"
+        />
+        <button type="button" bitSuffix bitIconButton bitPasswordInputToggle></button>
+      </bit-form-field>
+    </ng-container>
+
+    <ng-container bitDialogFooter>
+      <button bitButton buttonType="primary" bitFormButton type="submit">
+        <span>{{ "ok" | i18n }}</span>
+      </button>
+      <button bitButton buttonType="secondary" bitDialogClose type="button">
+        {{ "cancel" | i18n }}
+      </button>
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/libs/vault/src/components/password-reprompt.component.ts b/libs/vault/src/components/password-reprompt.component.ts
new file mode 100644
index 00000000000..fd8da6c574a
--- /dev/null
+++ b/libs/vault/src/components/password-reprompt.component.ts
@@ -0,0 +1,68 @@
+import { DialogRef } from "@angular/cdk/dialog";
+import { Component } from "@angular/core";
+import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  DialogModule,
+  FormFieldModule,
+  IconButtonModule,
+} from "@bitwarden/components";
+
+/**
+ * Used to verify the user's Master Password for the "Master Password Re-prompt" feature only.
+ * See UserVerificationComponent for any other situation where you need to verify the user's identity.
+ */
+@Component({
+  standalone: true,
+  selector: "vault-password-reprompt",
+  imports: [
+    JslibModule,
+    AsyncActionsModule,
+    ButtonModule,
+    DialogModule,
+    FormFieldModule,
+    IconButtonModule,
+    ReactiveFormsModule,
+  ],
+  templateUrl: "password-reprompt.component.html",
+})
+export class PasswordRepromptComponent {
+  formGroup = this.formBuilder.group({
+    masterPassword: ["", { validators: [Validators.required], updateOn: "submit" }],
+  });
+
+  constructor(
+    protected cryptoService: CryptoService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected i18nService: I18nService,
+    protected formBuilder: FormBuilder,
+    protected dialogRef: DialogRef
+  ) {}
+
+  submit = async () => {
+    const storedMasterKey = await this.cryptoService.getOrDeriveMasterKey(
+      this.formGroup.value.masterPassword
+    );
+    if (
+      !(await this.cryptoService.compareAndUpdateKeyHash(
+        this.formGroup.value.masterPassword,
+        storedMasterKey
+      ))
+    ) {
+      this.platformUtilsService.showToast(
+        "error",
+        this.i18nService.t("errorOccurred"),
+        this.i18nService.t("invalidMasterPassword")
+      );
+      return;
+    }
+
+    this.dialogRef.close(true);
+  };
+}
diff --git a/libs/vault/src/index.ts b/libs/vault/src/index.ts
index e69de29bb2d..bf6b7f91c23 100644
--- a/libs/vault/src/index.ts
+++ b/libs/vault/src/index.ts
@@ -0,0 +1 @@
+export { PasswordRepromptService } from "./services/password-reprompt.service";
diff --git a/libs/angular/src/vault/services/password-reprompt.service.spec.ts b/libs/vault/src/services/password-reprompt.service.spec.ts
similarity index 70%
rename from libs/angular/src/vault/services/password-reprompt.service.spec.ts
rename to libs/vault/src/services/password-reprompt.service.spec.ts
index f2fb64bac3a..300b98215c2 100644
--- a/libs/angular/src/vault/services/password-reprompt.service.spec.ts
+++ b/libs/vault/src/services/password-reprompt.service.spec.ts
@@ -1,8 +1,7 @@
 import { MockProxy, mock } from "jest-mock-extended";
 
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-
-import { ModalService } from "../../services/modal.service";
+import { UserVerificationService } from "@bitwarden/common/src/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { DialogService } from "@bitwarden/components";
 
 import { PasswordRepromptService } from "./password-reprompt.service";
 
@@ -10,13 +9,13 @@ describe("PasswordRepromptService", () => {
   let passwordRepromptService: PasswordRepromptService;
 
   let userVerificationService: MockProxy<UserVerificationService>;
-  let modalService: MockProxy<ModalService>;
+  let dialogService: MockProxy<DialogService>;
 
   beforeEach(() => {
-    modalService = mock<ModalService>();
+    dialogService = mock<DialogService>();
     userVerificationService = mock<UserVerificationService>();
 
-    passwordRepromptService = new PasswordRepromptService(modalService, userVerificationService);
+    passwordRepromptService = new PasswordRepromptService(dialogService, userVerificationService);
   });
 
   describe("enabled()", () => {
diff --git a/libs/angular/src/vault/services/password-reprompt.service.ts b/libs/vault/src/services/password-reprompt.service.ts
similarity index 61%
rename from libs/angular/src/vault/services/password-reprompt.service.ts
rename to libs/vault/src/services/password-reprompt.service.ts
index 7a06771a456..4b4a7a65f67 100644
--- a/libs/angular/src/vault/services/password-reprompt.service.ts
+++ b/libs/vault/src/services/password-reprompt.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from "@angular/core";
+import { lastValueFrom } from "rxjs";
 
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { DialogService } from "@bitwarden/components";
 
-import { ModalService } from "../../services/modal.service";
 import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 
 /**
@@ -11,11 +11,9 @@ import { PasswordRepromptComponent } from "../components/password-reprompt.compo
  * See UserVerificationService for any other situation where you need to verify the user's identity.
  */
 @Injectable()
-export class PasswordRepromptService implements PasswordRepromptServiceAbstraction {
-  protected component = PasswordRepromptComponent;
-
+export class PasswordRepromptService {
   constructor(
-    private modalService: ModalService,
+    private dialogService: DialogService,
     private userVerificationService: UserVerificationService
   ) {}
 
@@ -28,13 +26,12 @@ export class PasswordRepromptService implements PasswordRepromptServiceAbstracti
       return true;
     }
 
-    const ref = this.modalService.open(this.component, { allowMultipleModals: true });
+    const dialog = this.dialogService.open<boolean>(PasswordRepromptComponent, {
+      ariaModal: true,
+    });
 
-    if (ref == null) {
-      return false;
-    }
+    const result = await lastValueFrom(dialog.closed);
 
-    const result = await ref.onClosedPromise();
     return result === true;
   }
 
diff --git a/package-lock.json b/package-lock.json
index d38ca6ae304..d6436616218 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -123,7 +123,7 @@
         "cross-env": "7.0.3",
         "css-loader": "6.8.1",
         "del": "6.1.1",
-        "electron": "24.8.5",
+        "electron": "25.9.1",
         "electron-builder": "^23.6.0",
         "electron-log": "4.4.8",
         "electron-reload": "2.0.0-alpha.1",
@@ -154,7 +154,7 @@
         "mini-css-extract-plugin": "2.7.6",
         "node-ipc": "9.2.1",
         "pkg": "5.8.1",
-        "postcss": "8.4.27",
+        "postcss": "8.4.31",
         "postcss-loader": "7.3.3",
         "prettier": "2.8.8",
         "prettier-plugin-tailwindcss": "0.3.0",
@@ -193,7 +193,7 @@
     },
     "apps/cli": {
       "name": "@bitwarden/cli",
-      "version": "2023.9.1",
+      "version": "2023.9.2",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@koa/multer": "3.0.2",
@@ -229,7 +229,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2023.9.2",
+      "version": "2023.9.3",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -20179,9 +20179,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "24.8.5",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-24.8.5.tgz",
-      "integrity": "sha512-CWSF0CrD1XhxyoXUcCcEoJB8orMTHuOrkj2s87XU11vjgVJHhzhCBh9TVqhMQt7U6TtcGYa5kDIiLRekxJRaRA==",
+      "version": "25.9.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz",
+      "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -32902,9 +32902,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 4ca11450d04..763897c388c 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "cross-env": "7.0.3",
     "css-loader": "6.8.1",
     "del": "6.1.1",
-    "electron": "24.8.5",
+    "electron": "25.9.1",
     "electron-builder": "^23.6.0",
     "electron-log": "4.4.8",
     "electron-reload": "2.0.0-alpha.1",
@@ -119,7 +119,7 @@
     "mini-css-extract-plugin": "2.7.6",
     "node-ipc": "9.2.1",
     "pkg": "5.8.1",
-    "postcss": "8.4.27",
+    "postcss": "8.4.31",
     "postcss-loader": "7.3.3",
     "prettier": "2.8.8",
     "prettier-plugin-tailwindcss": "0.3.0",
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 1a435e93c37..d96a144ebcb 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -20,6 +20,7 @@
       "@bitwarden/common/*": ["./libs/common/src/*"],
       "@bitwarden/components": ["./libs/components/src"],
       "@bitwarden/exporter/*": ["./libs/exporter/src/*"],
+      "@bitwarden/importer": ["./libs/importer/src"],
       "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/vault": ["./libs/vault/src"]
     },