New translations en-us.json (Norwegian Bokmal)

New translations en-us.json (Chinese Simplified)
New translations en-us.json (Turkish)
2026-02-18 02:46:37 +00:00 · 2026-02-14 18:15:51 -08:00 · 2026-02-14 18:15:49 -08:00 · 2026-02-14 18:15:48 -08:00 · 2026-02-14 18:15:47 -08:00 · 2026-02-14 18:15:45 -08:00
33 changed files with 532 additions and 1027 deletions
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -77,7 +77,7 @@ jobs:
                  fi

            - name: Log in to Docker Hub
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
              with:
                  registry: docker.io
                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -149,7 +149,7 @@ jobs:
                  fi

            - name: Log in to Docker Hub
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
              with:
                  registry: docker.io
                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -204,7 +204,7 @@ jobs:
              uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

            - name: Log in to Docker Hub
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
              with:
                  registry: docker.io
                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -415,7 +415,7 @@ jobs:
              shell: bash

            - name: Login to GitHub Container Registry (for cosign)
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+              uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
              with:
                registry: ghcr.io
                username: ${{ github.actor }}
@@ -525,10 +525,41 @@ jobs:
                          VERIFIED_INDEX_KEYLESS=false
                        fi

-                        # Check if verification succeeded
-                        if [ "${VERIFIED_INDEX}" != "true" ] && [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
-                          echo "⚠️  WARNING: Verification not available for ${BASE_IMAGE}:${IMAGE_TAG}"
-                          echo "This may be due to registry propagation delays. Continuing anyway."
+                        # If index verification fails, attempt to verify child platform manifests
+                        if [ "${VERIFIED_INDEX}" != "true" ] || [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
+                          echo "Index verification not available; attempting child manifest verification for ${BASE_IMAGE}:${IMAGE_TAG}"
+                          CHILD_VERIFIED=false
+
+                          for ARCH in arm64 amd64; do
+                            CHILD_TAG="${IMAGE_TAG}-${ARCH}"
+                            echo "Resolving child digest for ${BASE_IMAGE}:${CHILD_TAG}"
+                            CHILD_DIGEST="$(skopeo inspect --retry-times 3 docker://${BASE_IMAGE}:${CHILD_TAG} | jq -r '.Digest' || true)"
+                            if [ -n "${CHILD_DIGEST}" ] && [ "${CHILD_DIGEST}" != "null" ]; then
+                              CHILD_REF="${BASE_IMAGE}@${CHILD_DIGEST}"
+                              echo "==> cosign verify (public key) child ${CHILD_REF}"
+                              if retry_verify "cosign verify --key env://COSIGN_PUBLIC_KEY '${CHILD_REF}' -o text"; then
+                                CHILD_VERIFIED=true
+                                echo "Public key verification succeeded for child ${CHILD_REF}"
+                              else
+                                echo "Public key verification failed for child ${CHILD_REF}"
+                              fi
+
+                              echo "==> cosign verify (keyless policy) child ${CHILD_REF}"
+                              if retry_verify "cosign verify --certificate-oidc-issuer '${issuer}' --certificate-identity-regexp '${id_regex}' '${CHILD_REF}' -o text"; then
+                                CHILD_VERIFIED=true
+                                echo "Keyless verification succeeded for child ${CHILD_REF}"
+                              else
+                                echo "Keyless verification failed for child ${CHILD_REF}"
+                              fi
+                            else
+                              echo "No child digest found for ${BASE_IMAGE}:${CHILD_TAG}; skipping"
+                            fi
+                          done
+
+                          if [ "${CHILD_VERIFIED}" != "true" ]; then
+                            echo "Failed to verify index and no child manifests verified for ${BASE_IMAGE}:${IMAGE_TAG}"
+                            exit 1
+                          fi
                        fi
                      ) || TAG_FAILED=true

--- a/messages/bg-BG.json
+++ b/messages/bg-BG.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Изберете протокол",
    "resourcePortNumber": "Номер на порт",
    "resourcePortNumberDescription": "Външен номер на порт за прокси заявки.",
+    "back": "Back",
    "cancel": "Отмяна",
    "resourceConfig": "Конфигурационни фрагменти",
    "resourceConfigDescription": "Копирайте и поставете тези конфигурационни отрязъци, за да настроите TCP/UDP ресурса",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Възникна грешка при изтриването на организацията.",
    "orgDeleted": "Организацията е изтрита",
    "orgDeletedMessage": "Организацията и нейните данни са изтрити.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Липсва идентификатор на организация",
    "orgMissingMessage": "Невъзможност за регенериране на покана без идентификатор на организация.",
    "accessUsersManage": "Управление на потребители",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Филтрирайте по състояние на одобрение",
    "approvalListEmpty": "Няма одобрения",
    "approvalState": "Състояние на одобрение",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Одобряване",
    "approved": "Одобрен",
    "denied": "Отказан",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Преглед на дневници",
    "noneSelected": "Нищо не е избрано",
    "orgNotFound2": "Няма намерени организации.",
-    "searchProgress": "Търсене...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Създаване",
    "orgs": "Организации",
    "loginError": "Възникна неочаквана грешка. Моля, опитайте отново.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Сигурни ли сте, че искате да премахнете брандинга за страниците за автентификация?",
    "authPageBrandingDeleteConfirm": "Потвърждение на изтриване на брандинга.",
    "brandingLogoURL": "URL адрес на логото.",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Основен цвят.",
    "brandingLogoWidth": "Ширина (px).",
    "brandingLogoHeight": "Височина (px).",
--- a/messages/cs-CZ.json
+++ b/messages/cs-CZ.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Vybrat protokol",
    "resourcePortNumber": "Číslo portu",
    "resourcePortNumberDescription": "Externí port k požadavkům proxy serveru.",
+    "back": "Back",
    "cancel": "Zrušit",
    "resourceConfig": "Konfigurační snippety",
    "resourceConfigDescription": "Zkopírujte a vložte tyto konfigurační textové bloky pro nastavení TCP/UDP zdroje",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Došlo k chybě při odstraňování organizace.",
    "orgDeleted": "Organizace odstraněna",
    "orgDeletedMessage": "Organizace a její data byla smazána.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Chybí ID organizace",
    "orgMissingMessage": "Nelze obnovit pozvánku bez ID organizace.",
    "accessUsersManage": "Spravovat uživatele",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtrovat podle státu schválení",
    "approvalListEmpty": "Žádná schválení",
    "approvalState": "Země schválení",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Schválit",
    "approved": "Schváleno",
    "denied": "Zamítnuto",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Zobrazit logy",
    "noneSelected": "Není vybráno",
    "orgNotFound2": "Nebyly nalezeny žádné organizace.",
-    "searchProgress": "Hledat...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Vytvořit",
    "orgs": "Organizace",
    "loginError": "Došlo k neočekávané chybě. Zkuste to prosím znovu.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Jste si jisti, že chcete odstranit branding autentizačních stránek?",
    "authPageBrandingDeleteConfirm": "Potvrzení odstranění brandingu",
    "brandingLogoURL": "URL loga",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Primární barva",
    "brandingLogoWidth": "Šířka (px)",
    "brandingLogoHeight": "Výška (px)",
--- a/messages/de-DE.json
+++ b/messages/de-DE.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Wählen Sie ein Protokoll",
    "resourcePortNumber": "Portnummer",
    "resourcePortNumberDescription": "Die externe Portnummer für Proxy-Anfragen.",
+    "back": "Back",
    "cancel": "Abbrechen",
    "resourceConfig": "Konfiguration Snippets",
    "resourceConfigDescription": "Kopieren und fügen Sie diese Konfigurations-Snippets ein, um die TCP/UDP Ressource einzurichten",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Beim Löschen der Organisation ist ein Fehler aufgetreten.",
    "orgDeleted": "Organisation gelöscht",
    "orgDeletedMessage": "Die Organisation und ihre Daten wurden gelöscht.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Organisations-ID fehlt",
    "orgMissingMessage": "Einladung kann ohne Organisations-ID nicht neu generiert werden.",
    "accessUsersManage": "Benutzer verwalten",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtern nach Genehmigungsstatus",
    "approvalListEmpty": "Keine Genehmigungen",
    "approvalState": "Genehmigungsstatus",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Bestätigen",
    "approved": "Genehmigt",
    "denied": "Verweigert",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Logs anzeigen",
    "noneSelected": "Keine ausgewählt",
    "orgNotFound2": "Keine Organisationen gefunden.",
-    "searchProgress": "Suche...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Erstellen",
    "orgs": "Organisationen",
    "loginError": "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Sind Sie sicher, dass Sie das Branding für Authentifizierungsseiten entfernen möchten?",
    "authPageBrandingDeleteConfirm": "Branding löschen bestätigen",
    "brandingLogoURL": "Logo URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Primär-Farbe",
    "brandingLogoWidth": "Breite (px)",
    "brandingLogoHeight": "Höhe (px)",
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -201,7 +201,6 @@
    "protocolSelect": "Select a protocol",
    "resourcePortNumber": "Port Number",
    "resourcePortNumberDescription": "The external port number to proxy requests.",
-    "back": "Back",
    "cancel": "Cancel",
    "resourceConfig": "Configuration Snippets",
    "resourceConfigDescription": "Copy and paste these configuration snippets to set up the TCP/UDP resource",
@@ -247,17 +246,6 @@
    "orgErrorDeleteMessage": "An error occurred while deleting the organization.",
    "orgDeleted": "Organization deleted",
    "orgDeletedMessage": "The organization and its data has been deleted.",
-    "deleteAccount": "Delete Account",
-    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
-    "deleteAccountButton": "Delete Account",
-    "deleteAccountConfirmTitle": "Delete Account",
-    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
-    "deleteAccountConfirmString": "delete account",
-    "deleteAccountSuccess": "Account Deleted",
-    "deleteAccountSuccessMessage": "Your account has been deleted.",
-    "deleteAccountError": "Failed to delete account",
-    "deleteAccountPreviewAccount": "Your Account",
-    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Organization ID Missing",
    "orgMissingMessage": "Unable to regenerate invitation without an organization ID.",
    "accessUsersManage": "Manage Users",
--- a/messages/es-ES.json
+++ b/messages/es-ES.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Seleccionar un protocolo",
    "resourcePortNumber": "Número de puerto",
    "resourcePortNumberDescription": "El número de puerto externo a las solicitudes de proxy.",
+    "back": "Back",
    "cancel": "Cancelar",
    "resourceConfig": "Fragmentos de configuración",
    "resourceConfigDescription": "Copia y pega estos fragmentos de configuración para configurar el recurso TCP/UDP",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Se ha producido un error al eliminar la organización.",
    "orgDeleted": "Organización eliminada",
    "orgDeletedMessage": "La organización y sus datos han sido eliminados.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Falta el ID de la organización",
    "orgMissingMessage": "No se puede regenerar la invitación sin el ID de la organización.",
    "accessUsersManage": "Administrar usuarios",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtrar por estado de aprobación",
    "approvalListEmpty": "No hay aprobaciones",
    "approvalState": "Estado de aprobación",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Aprobar",
    "approved": "Aprobado",
    "denied": "Denegado",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Ver registros",
    "noneSelected": "Ninguno seleccionado",
    "orgNotFound2": "No se encontraron organizaciones.",
-    "searchProgress": "Buscar...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Crear",
    "orgs": "Organizaciones",
    "loginError": "Ocurrió un error inesperado. Por favor, inténtelo de nuevo.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "¿Está seguro de que desea eliminar la marca de las páginas de autenticación?",
    "authPageBrandingDeleteConfirm": "Confirmar eliminación de la marca",
    "brandingLogoURL": "URL del logotipo",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Color primario",
    "brandingLogoWidth": "Ancho (px)",
    "brandingLogoHeight": "Altura (px)",
--- a/messages/fr-FR.json
+++ b/messages/fr-FR.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Choisir un protocole",
    "resourcePortNumber": "Numéro de port",
    "resourcePortNumberDescription": "Le numéro de port externe pour les requêtes de proxy.",
+    "back": "Back",
    "cancel": "Abandonner",
    "resourceConfig": "Snippets de configuration",
    "resourceConfigDescription": "Copiez et collez ces extraits de configuration pour configurer la ressource TCP/UDP",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Une erreur s'est produite lors de la suppression de l'organisation.",
    "orgDeleted": "Organisation supprimée",
    "orgDeletedMessage": "L'organisation et ses données ont été supprimées.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "ID d'organisation manquant",
    "orgMissingMessage": "Impossible de régénérer l'invitation sans un ID d'organisation.",
    "accessUsersManage": "Gérer les utilisateurs",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtrer par État d'Approbation",
    "approvalListEmpty": "Aucune approbation",
    "approvalState": "État d'approbation",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Approuver",
    "approved": "Approuvé",
    "denied": "Refusé",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Voir les logs",
    "noneSelected": "Aucune sélection",
    "orgNotFound2": "Aucune organisation trouvée.",
-    "searchProgress": "Rechercher...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Créer",
    "orgs": "Organisations",
    "loginError": "Une erreur inattendue s'est produite. Veuillez réessayer.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Êtes-vous sûr de vouloir supprimer la marque des pages d'authentification ?",
    "authPageBrandingDeleteConfirm": "Confirmer la suppression de la marque",
    "brandingLogoURL": "URL du logo",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Couleur principale",
    "brandingLogoWidth": "Largeur (px)",
    "brandingLogoHeight": "Hauteur (px)",
--- a/messages/it-IT.json
+++ b/messages/it-IT.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Seleziona un protocollo",
    "resourcePortNumber": "Numero Porta",
    "resourcePortNumberDescription": "Il numero di porta esterna per le richieste di proxy.",
+    "back": "Back",
    "cancel": "Annulla",
    "resourceConfig": "Snippet Di Configurazione",
    "resourceConfigDescription": "Copia e incolla questi snippet di configurazione per configurare la risorsa TCP/UDP",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Si è verificato un errore durante l'eliminazione dell'organizzazione.",
    "orgDeleted": "Organizzazione eliminata",
    "orgDeletedMessage": "L'organizzazione e i suoi dati sono stati eliminati.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "ID Organizzazione Mancante",
    "orgMissingMessage": "Impossibile rigenerare l'invito senza un ID organizzazione.",
    "accessUsersManage": "Gestisci Utenti",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtra Per Stato Di Approvazione",
    "approvalListEmpty": "Nessuna approvazione",
    "approvalState": "Stato Di Approvazione",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Approva",
    "approved": "Approvato",
    "denied": "Negato",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Visualizza Log",
    "noneSelected": "Nessuna selezione",
    "orgNotFound2": "Nessuna organizzazione trovata.",
-    "searchProgress": "Ricerca...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Crea",
    "orgs": "Organizzazioni",
    "loginError": "Si è verificato un errore imprevisto. Riprova.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Sei sicuro di voler rimuovere il branding per le pagine di autenticazione?",
    "authPageBrandingDeleteConfirm": "Conferma Eliminazione Branding",
    "brandingLogoURL": "URL Logo",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Colore Primario",
    "brandingLogoWidth": "Larghezza (px)",
    "brandingLogoHeight": "Altezza (px)",
--- a/messages/ko-KR.json
+++ b/messages/ko-KR.json
@@ -201,6 +201,7 @@
    "protocolSelect": "프로토콜 선택",
    "resourcePortNumber": "포트 번호",
    "resourcePortNumberDescription": "요청을 프록시하기 위한 외부 포트 번호입니다.",
+    "back": "Back",
    "cancel": "취소",
    "resourceConfig": "구성 스니펫",
    "resourceConfigDescription": "TCP/UDP 리소스를 설정하기 위해 이 구성 스니펫을 복사하여 붙여넣습니다.",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "조직을 삭제하는 중 오류가 발생했습니다.",
    "orgDeleted": "조직이 삭제되었습니다.",
    "orgDeletedMessage": "조직과 그 데이터가 삭제되었습니다.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "조직 ID가 누락되었습니다",
    "orgMissingMessage": "조직 ID 없이 초대장을 재생성할 수 없습니다.",
    "accessUsersManage": "사용자 관리",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "승인 상태로 필터링",
    "approvalListEmpty": "승인이 없습니다.",
    "approvalState": "승인 상태",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "승인",
    "approved": "승인됨",
    "denied": "거부됨",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "로그 보기",
    "noneSelected": "선택된 항목 없음",
    "orgNotFound2": "조직이 없습니다.",
-    "searchProgress": "검색...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "생성",
    "orgs": "조직",
    "loginError": "예기치 않은 오류가 발생했습니다. 다시 시도해주세요.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "인증 페이지의 브랜딩을 제거하시겠습니까?",
    "authPageBrandingDeleteConfirm": "브랜딩 삭제 확인",
    "brandingLogoURL": "로고 URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "기본 색상",
    "brandingLogoWidth": "너비(px)",
    "brandingLogoHeight": "높이(px)",
--- a/messages/nb-NO.json
+++ b/messages/nb-NO.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Velg en protokoll",
    "resourcePortNumber": "Portnummer",
    "resourcePortNumberDescription": "Det eksterne portnummeret for proxy forespørsler.",
+    "back": "Back",
    "cancel": "Avbryt",
    "resourceConfig": "Konfigurasjonsutdrag",
    "resourceConfigDescription": "Kopier og lim inn disse konfigurasjons-øyeblikkene for å sette opp TCP/UDP ressursen",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Det oppsto en feil under sletting av organisasjonen.",
    "orgDeleted": "Organisasjon slettet",
    "orgDeletedMessage": "Organisasjonen og tilhørende data er slettet.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Organisasjons-ID Mangler",
    "orgMissingMessage": "Kan ikke regenerere invitasjon uten en organisasjons-ID.",
    "accessUsersManage": "Administrer brukere",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtrer etter godkjenningsstatus",
    "approvalListEmpty": "Ingen godkjenninger",
    "approvalState": "Godkjennings tilstand",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Godkjenn",
    "approved": "Godkjent",
    "denied": "Avvist",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Vis logger",
    "noneSelected": "Ingen valgt",
    "orgNotFound2": "Ingen organisasjoner funnet.",
-    "searchProgress": "Søker...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Opprett",
    "orgs": "Organisasjoner",
    "loginError": "En uventet feil oppstod. Vennligst prøv igjen.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Er du sikker på at du vil fjerne merkevarebyggingen for autentiseringssider?",
    "authPageBrandingDeleteConfirm": "Bekreft sletting av merkevarebygging",
    "brandingLogoURL": "Logo URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Primærfarge",
    "brandingLogoWidth": "Bredde (px)",
    "brandingLogoHeight": "Høyde (px)",
--- a/messages/nl-NL.json
+++ b/messages/nl-NL.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Selecteer een protocol",
    "resourcePortNumber": "Nummer van poort",
    "resourcePortNumberDescription": "Het externe poortnummer naar proxyverzoeken.",
+    "back": "Back",
    "cancel": "Annuleren",
    "resourceConfig": "Configuratie tekstbouwstenen",
    "resourceConfigDescription": "Kopieer en plak deze configuratie-snippets om de TCP/UDP-bron in te stellen",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Er is een fout opgetreden tijdens het verwijderen van de organisatie.",
    "orgDeleted": "Organisatie verwijderd",
    "orgDeletedMessage": "De organisatie en haar gegevens zijn verwijderd.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Organisatie-ID ontbreekt",
    "orgMissingMessage": "Niet in staat om de uitnodiging te regenereren zonder organisatie-ID.",
    "accessUsersManage": "Gebruikers beheren",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filter op goedkeuringsstatus",
    "approvalListEmpty": "Geen goedkeuringen",
    "approvalState": "Goedkeuring status",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Goedkeuren",
    "approved": "Goedgekeurd",
    "denied": "Geweigerd",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Logboeken bekijken",
    "noneSelected": "Niet geselecteerd",
    "orgNotFound2": "Geen organisaties gevonden.",
-    "searchProgress": "Zoeken...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Aanmaken",
    "orgs": "Organisaties",
    "loginError": "Er is een onverwachte fout opgetreden. Probeer het opnieuw.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Weet u zeker dat u de branding voor Auth-pagina's wilt verwijderen?",
    "authPageBrandingDeleteConfirm": "Bevestig verwijder Branding",
    "brandingLogoURL": "Het logo-URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Primaire kleur",
    "brandingLogoWidth": "Breedte (px)",
    "brandingLogoHeight": "Hoogte (px)",
--- a/messages/pl-PL.json
+++ b/messages/pl-PL.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Wybierz protokół",
    "resourcePortNumber": "Numer portu",
    "resourcePortNumberDescription": "Numer portu zewnętrznego do żądań proxy.",
+    "back": "Back",
    "cancel": "Anuluj",
    "resourceConfig": "Snippety konfiguracji",
    "resourceConfigDescription": "Skopiuj i wklej te fragmenty konfiguracji, aby skonfigurować zasób TCP/UDP",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Wystąpił błąd podczas usuwania organizacji.",
    "orgDeleted": "Organizacja usunięta",
    "orgDeletedMessage": "Organizacja i jej dane zostały usunięte.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Brak ID organizacji",
    "orgMissingMessage": "Nie można ponownie wygenerować zaproszenia bez ID organizacji.",
    "accessUsersManage": "Zarządzaj użytkownikami",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtruj według państwa zatwierdzenia",
    "approvalListEmpty": "Brak zatwierdzeń",
    "approvalState": "Państwo zatwierdzające",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Zatwierdź",
    "approved": "Zatwierdzone",
    "denied": "Odmowa",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Zobacz dzienniki",
    "noneSelected": "Nie wybrano",
    "orgNotFound2": "Nie znaleziono organizacji.",
-    "searchProgress": "Szukaj...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Utwórz",
    "orgs": "Organizacje",
    "loginError": "Wystąpił nieoczekiwany błąd. Spróbuj ponownie.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Czy na pewno chcesz usunąć branding dla stron uwierzytelniania?",
    "authPageBrandingDeleteConfirm": "Potwierdź usunięcie brandingu",
    "brandingLogoURL": "URL logo",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Główny kolor",
    "brandingLogoWidth": "Szerokość (piksele)",
    "brandingLogoHeight": "Wysokość (piksele)",
--- a/messages/pt-PT.json
+++ b/messages/pt-PT.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Selecione um protocolo",
    "resourcePortNumber": "Número da Porta",
    "resourcePortNumberDescription": "O número da porta externa para requisições de proxy.",
+    "back": "Back",
    "cancel": "cancelar",
    "resourceConfig": "Snippets de Configuração",
    "resourceConfigDescription": "Copie e cole estes snippets de configuração para configurar o recurso TCP/UDP",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Ocorreu um erro ao apagar a organização.",
    "orgDeleted": "Organização excluída",
    "orgDeletedMessage": "A organização e seus dados foram excluídos.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "ID da Organização Ausente",
    "orgMissingMessage": "Não é possível regenerar o convite sem um ID de organização.",
    "accessUsersManage": "Gerir Utilizadores",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Filtrar por estado de aprovação",
    "approvalListEmpty": "Sem aprovações",
    "approvalState": "Estado de aprovação",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Aprovar",
    "approved": "Aceito",
    "denied": "Negado",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Visualizar registros",
    "noneSelected": "Nenhum selecionado",
    "orgNotFound2": "Nenhuma organização encontrada.",
-    "searchProgress": "Pesquisar...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Criar",
    "orgs": "Organizações",
    "loginError": "Ocorreu um erro inesperado. Por favor, tente novamente.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Tem certeza de que deseja remover a marcação das Páginas de Autenticação?",
    "authPageBrandingDeleteConfirm": "Confirmar Exclusão de Marca",
    "brandingLogoURL": "URL do Logo",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Cor Primária",
    "brandingLogoWidth": "Largura (px)",
    "brandingLogoHeight": "Altura (px)",
--- a/messages/ru-RU.json
+++ b/messages/ru-RU.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Выберите протокол",
    "resourcePortNumber": "Номер порта",
    "resourcePortNumberDescription": "Внешний номер порта для проксирования запросов.",
+    "back": "Back",
    "cancel": "Отмена",
    "resourceConfig": "Фрагменты конфигурации",
    "resourceConfigDescription": "Скопируйте и вставьте эти сниппеты для настройки TCP/UDP ресурса",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Произошла ошибка при удалении организации.",
    "orgDeleted": "Организация удалена",
    "orgDeletedMessage": "Организация и её данные были удалены.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Отсутствует ID организации",
    "orgMissingMessage": "Невозможно восстановить приглашение без ID организации.",
    "accessUsersManage": "Управление пользователями",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Фильтр по состоянию утверждения",
    "approvalListEmpty": "Нет утверждений",
    "approvalState": "Состояние одобрения",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Одобрить",
    "approved": "Одобрено",
    "denied": "Отказано",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Просмотр журналов",
    "noneSelected": "Ничего не выбрано",
    "orgNotFound2": "Организации не найдены.",
-    "searchProgress": "Поиск...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Создать",
    "orgs": "Организации",
    "loginError": "Произошла непредвиденная ошибка. Пожалуйста, попробуйте еще раз.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Вы уверены, что хотите удалить брендирование для страниц аутентификации?",
    "authPageBrandingDeleteConfirm": "Подтвердить удаление брендирования",
    "brandingLogoURL": "URL логотипа",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Основной цвет",
    "brandingLogoWidth": "Ширина (px)",
    "brandingLogoHeight": "Высота (px)",
--- a/messages/tr-TR.json
+++ b/messages/tr-TR.json
@@ -201,6 +201,7 @@
    "protocolSelect": "Bir protokol seçin",
    "resourcePortNumber": "Port Numarası",
    "resourcePortNumberDescription": "Vekil istekler için harici port numarası.",
+    "back": "Back",
    "cancel": "İptal",
    "resourceConfig": "Yapılandırma Parçaları",
    "resourceConfigDescription": "TCP/UDP kaynağınızı kurmak için bu yapılandırma parçalarını kopyalayıp yapıştırın",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "Organizasyon silinirken bir hata oluştu.",
    "orgDeleted": "Organizasyon silindi",
    "orgDeletedMessage": "Organizasyon ve verileri silindi.",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "Organizasyon Kimliği Eksik",
    "orgMissingMessage": "Organizasyon kimliği olmadan daveti yeniden oluşturmanız mümkün değildir.",
    "accessUsersManage": "Kullanıcıları Yönet",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "Onay Durumuna Göre Filtrele",
    "approvalListEmpty": "Onay yok",
    "approvalState": "Onay Durumu",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "Onayla",
    "approved": "Onaylandı",
    "denied": "Reddedildi",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "Kayıtları Görüntüle",
    "noneSelected": "Hiçbiri seçili değil",
    "orgNotFound2": "Hiçbir organizasyon bulunamadı.",
-    "searchProgress": "Ara...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "Oluştur",
    "orgs": "Organizasyonlar",
    "loginError": "Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "Kimlik Sayfaları için markayı kaldırmak istediğinizden emin misiniz?",
    "authPageBrandingDeleteConfirm": "Markayı Silmeyi Onayla",
    "brandingLogoURL": "Logo URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "Ana Renk",
    "brandingLogoWidth": "Genişlik (px)",
    "brandingLogoHeight": "Yükseklik (px)",
--- a/messages/zh-CN.json
+++ b/messages/zh-CN.json
@@ -201,6 +201,7 @@
    "protocolSelect": "选择协议",
    "resourcePortNumber": "端口号",
    "resourcePortNumberDescription": "代理请求的外部端口号。",
+    "back": "Back",
    "cancel": "取消",
    "resourceConfig": "配置片段",
    "resourceConfigDescription": "复制并粘贴这些配置片段以设置 TCP/UDP 资源",
@@ -246,6 +247,17 @@
    "orgErrorDeleteMessage": "删除组织时出错。",
    "orgDeleted": "组织已删除",
    "orgDeletedMessage": "组织及其数据已被删除。",
+    "deleteAccount": "Delete Account",
+    "deleteAccountDescription": "Permanently delete your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountButton": "Delete Account",
+    "deleteAccountConfirmTitle": "Delete Account",
+    "deleteAccountConfirmMessage": "This will permanently wipe your account, all organizations you own, and all data within those organizations. This cannot be undone.",
+    "deleteAccountConfirmString": "delete account",
+    "deleteAccountSuccess": "Account Deleted",
+    "deleteAccountSuccessMessage": "Your account has been deleted.",
+    "deleteAccountError": "Failed to delete account",
+    "deleteAccountPreviewAccount": "Your Account",
+    "deleteAccountPreviewOrgs": "Organizations you own (and all their data)",
    "orgMissing": "缺少组织 ID",
    "orgMissingMessage": "没有组织ID，无法重新生成邀请。",
    "accessUsersManage": "管理用户",
@@ -461,6 +473,8 @@
    "filterByApprovalState": "按批准状态过滤",
    "approvalListEmpty": "无批准",
    "approvalState": "审批状态",
+    "approvalLoadMore": "Load more",
+    "loadingApprovals": "Loading Approvals",
    "approve": "批准",
    "approved": "已批准",
    "denied": "被拒绝",
@@ -1169,7 +1183,8 @@
    "actionViewLogs": "查看日志",
    "noneSelected": "未选择",
    "orgNotFound2": "未找到组织。",
-    "searchProgress": "搜索中...",
+    "searchPlaceholder": "Search...",
+    "emptySearchOptions": "No options found",
    "create": "创建",
    "orgs": "组织",
    "loginError": "发生意外错误。请重试。",
@@ -1916,6 +1931,9 @@
    "authPageBrandingQuestionRemove": "您确定要移除授权页面的品牌吗？",
    "authPageBrandingDeleteConfirm": "确认删除品牌",
    "brandingLogoURL": "Logo URL",
+    "brandingLogoURLOrPath": "Logo URL or Path",
+    "brandingLogoPathDescription": "Enter a URL or a local path.",
+    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
    "brandingPrimaryColor": "主要颜色",
    "brandingLogoWidth": "宽度（px）",
    "brandingLogoHeight": "高度（px）",
--- a/server/lib/billing/limitSet.ts
+++ b/server/lib/billing/limitSet.ts
@@ -15,10 +15,10 @@ export const sandboxLimitSet: LimitSet = {
 };

 export const freeLimitSet: LimitSet = {
-    [FeatureId.SITES]: { value: 5, description: "Basic limit" },
-    [FeatureId.USERS]: { value: 5, description: "Basic limit" },
-    [FeatureId.DOMAINS]: { value: 5, description: "Basic limit" },
-    [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Basic limit" },
+    [FeatureId.USERS]: { value: 5, description: "Starter limit" },
+    [FeatureId.SITES]: { value: 5, description: "Starter limit" },
+    [FeatureId.DOMAINS]: { value: 5, description: "Starter limit" },
+    [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Starter limit" },
 };

 export const tier1LimitSet: LimitSet = {
--- a/server/lib/deleteOrg.ts
+++ b/server/lib/deleteOrg.ts
@@ -1,169 +0,0 @@
-import {
-    clients,
-    clientSiteResourcesAssociationsCache,
-    clientSitesAssociationsCache,
-    db,
-    domains,
-    olms,
-    orgDomains,
-    orgs,
-    resources,
-    sites
-} from "@server/db";
-import { newts, newtSessions } from "@server/db";
-import { eq, and, inArray, sql } from "drizzle-orm";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { sendToClient } from "#dynamic/routers/ws";
-import { deletePeer } from "@server/routers/gerbil/peers";
-import { OlmErrorCodes } from "@server/routers/olm/error";
-import { sendTerminateClient } from "@server/routers/client/terminate";
-
-export type DeleteOrgByIdResult = {
-    deletedNewtIds: string[];
-    olmsToTerminate: string[];
-};
-
-/**
- * Deletes one organization and its related data. Returns ids for termination
- * messages; caller should call sendTerminationMessages with the result.
- * Throws if org not found.
- */
-export async function deleteOrgById(
-    orgId: string
-): Promise<DeleteOrgByIdResult> {
-    const [org] = await db
-        .select()
-        .from(orgs)
-        .where(eq(orgs.orgId, orgId))
-        .limit(1);
-
-    if (!org) {
-        throw createHttpError(
-            HttpCode.NOT_FOUND,
-            `Organization with ID ${orgId} not found`
-        );
-    }
-
-    const orgSites = await db
-        .select()
-        .from(sites)
-        .where(eq(sites.orgId, orgId))
-        .limit(1);
-
-    const orgClients = await db
-        .select()
-        .from(clients)
-        .where(eq(clients.orgId, orgId));
-
-    const deletedNewtIds: string[] = [];
-    const olmsToTerminate: string[] = [];
-
-    await db.transaction(async (trx) => {
-        for (const site of orgSites) {
-            if (site.pubKey) {
-                if (site.type == "wireguard") {
-                    await deletePeer(site.exitNodeId!, site.pubKey);
-                } else if (site.type == "newt") {
-                    const [deletedNewt] = await trx
-                        .delete(newts)
-                        .where(eq(newts.siteId, site.siteId))
-                        .returning();
-                    if (deletedNewt) {
-                        deletedNewtIds.push(deletedNewt.newtId);
-                        await trx
-                            .delete(newtSessions)
-                            .where(
-                                eq(newtSessions.newtId, deletedNewt.newtId)
-                            );
-                    }
-                }
-            }
-            logger.info(`Deleting site ${site.siteId}`);
-            await trx.delete(sites).where(eq(sites.siteId, site.siteId));
-        }
-        for (const client of orgClients) {
-            const [olm] = await trx
-                .select()
-                .from(olms)
-                .where(eq(olms.clientId, client.clientId))
-                .limit(1);
-            if (olm) {
-                olmsToTerminate.push(olm.olmId);
-            }
-            logger.info(`Deleting client ${client.clientId}`);
-            await trx
-                .delete(clients)
-                .where(eq(clients.clientId, client.clientId));
-            await trx
-                .delete(clientSiteResourcesAssociationsCache)
-                .where(
-                    eq(
-                        clientSiteResourcesAssociationsCache.clientId,
-                        client.clientId
-                    )
-                );
-            await trx
-                .delete(clientSitesAssociationsCache)
-                .where(
-                    eq(clientSitesAssociationsCache.clientId, client.clientId)
-                );
-        }
-        const allOrgDomains = await trx
-            .select()
-            .from(orgDomains)
-            .innerJoin(domains, eq(domains.domainId, orgDomains.domainId))
-            .where(
-                and(
-                    eq(orgDomains.orgId, orgId),
-                    eq(domains.configManaged, false)
-                )
-            );
-        const domainIdsToDelete: string[] = [];
-        for (const orgDomain of allOrgDomains) {
-            const domainId = orgDomain.domains.domainId;
-            const orgCount = await trx
-                .select({ count: sql<number>`count(*)` })
-                .from(orgDomains)
-                .where(eq(orgDomains.domainId, domainId));
-            if (orgCount[0].count === 1) {
-                domainIdsToDelete.push(domainId);
-            }
-        }
-        if (domainIdsToDelete.length > 0) {
-            await trx
-                .delete(domains)
-                .where(inArray(domains.domainId, domainIdsToDelete));
-        }
-        await trx.delete(resources).where(eq(resources.orgId, orgId));
-        await trx.delete(orgs).where(eq(orgs.orgId, orgId));
-    });
-
-    return { deletedNewtIds, olmsToTerminate };
-}
-
-export function sendTerminationMessages(result: DeleteOrgByIdResult): void {
-    for (const newtId of result.deletedNewtIds) {
-        sendToClient(newtId, { type: `newt/wg/terminate`, data: {} }).catch(
-            (error) => {
-                logger.error(
-                    "Failed to send termination message to newt:",
-                    error
-                );
-            }
-        );
-    }
-    for (const olmId of result.olmsToTerminate) {
-        sendTerminateClient(
-            0,
-            OlmErrorCodes.TERMINATED_REKEYED,
-            olmId
-        ).catch((error) => {
-            logger.error(
-                "Failed to send termination message to olm:",
-                error
-            );
-        });
-    }
-}
--- a/server/private/routers/orgIdp/createOrgOidcIdp.ts
+++ b/server/private/routers/orgIdp/createOrgOidcIdp.ts
@@ -28,7 +28,6 @@ import { CreateOrgIdpResponse } from "@server/routers/orgIdp/types";
 import { isSubscribed } from "#private/lib/isSubscribed";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import privateConfig from "#private/lib/config";
-import { build } from "@server/build";

 const paramsSchema = z.strictObject({ orgId: z.string().nonempty() });

@@ -123,14 +122,12 @@ export async function createOrgOidcIdp(

        let { autoProvision } = parsedBody.data;

-        if (build == "saas") { // this is not paywalled with a ee license because this whole endpoint is restricted
-            const subscribed = await isSubscribed(
-                orgId,
-                tierMatrix.deviceApprovals
-            );
-            if (!subscribed) {
-                autoProvision = false;
-            }
+        const subscribed = await isSubscribed(
+            orgId,
+            tierMatrix.deviceApprovals
+        );
+        if (!subscribed) {
+            autoProvision = false;
        }

        const key = config.getRawConfig().server.secret!;
--- a/server/private/routers/orgIdp/updateOrgOidcIdp.ts
+++ b/server/private/routers/orgIdp/updateOrgOidcIdp.ts
@@ -27,7 +27,6 @@ import config from "@server/lib/config";
 import { isSubscribed } from "#private/lib/isSubscribed";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import privateConfig from "#private/lib/config";
-import { build } from "@server/build";

 const paramsSchema = z
    .object({
@@ -128,15 +127,12 @@ export async function updateOrgOidcIdp(

        let { autoProvision } = parsedBody.data;

-        if (build == "saas") {
-            // this is not paywalled with a ee license because this whole endpoint is restricted
-            const subscribed = await isSubscribed(
-                orgId,
-                tierMatrix.deviceApprovals
-            );
-            if (!subscribed) {
-                autoProvision = false;
-            }
+        const subscribed = await isSubscribed(
+            orgId,
+            tierMatrix.deviceApprovals
+        );
+        if (!subscribed) {
+            autoProvision = false;
        }

        // Check if IDP exists and is of type OIDC
--- a/server/routers/auth/deleteMyAccount.ts
+++ b/server/routers/auth/deleteMyAccount.ts
@@ -1,228 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db, orgs, userOrgs, users } from "@server/db";
-import { eq, and, inArray } from "drizzle-orm";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { verifySession } from "@server/auth/sessions/verifySession";
-import {
-    invalidateSession,
-    createBlankSessionTokenCookie
-} from "@server/auth/sessions/app";
-import { verifyPassword } from "@server/auth/password";
-import { verifyTotpCode } from "@server/auth/totp";
-import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
-import {
-    deleteOrgById,
-    sendTerminationMessages
-} from "@server/lib/deleteOrg";
-import { UserType } from "@server/types/UserTypes";
-
-const deleteMyAccountBody = z.strictObject({
-    password: z.string().optional(),
-    code: z.string().optional()
-});
-
-export type DeleteMyAccountPreviewResponse = {
-    preview: true;
-    orgs: { orgId: string; name: string }[];
-    twoFactorEnabled: boolean;
-};
-
-export type DeleteMyAccountCodeRequestedResponse = {
-    codeRequested: true;
-};
-
-export type DeleteMyAccountSuccessResponse = {
-    success: true;
-};
-
-/**
- * Self-service account deletion (saas only). Returns preview when no password;
- * requires password and optional 2FA code to perform deletion. Uses shared
- * deleteOrgById for each owned org (delete-my-account may delete multiple orgs).
- */
-export async function deleteMyAccount(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const { user, session } = await verifySession(req);
-        if (!user || !session) {
-            return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "Not authenticated")
-            );
-        }
-
-        if (user.serverAdmin) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Server admins cannot delete their account this way"
-                )
-            );
-        }
-
-        if (user.type !== UserType.Internal) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Account deletion with password is only supported for internal users"
-                )
-            );
-        }
-
-        const parsed = deleteMyAccountBody.safeParse(req.body ?? {});
-        if (!parsed.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsed.error).toString()
-                )
-            );
-        }
-        const { password, code } = parsed.data;
-
-        const userId = user.userId;
-
-        const ownedOrgsRows = await db
-            .select({
-                orgId: userOrgs.orgId
-            })
-            .from(userOrgs)
-            .where(
-                and(
-                    eq(userOrgs.userId, userId),
-                    eq(userOrgs.isOwner, true)
-                )
-            );
-
-        const orgIds = ownedOrgsRows.map((r) => r.orgId);
-
-        if (!password) {
-            const orgsWithNames =
-                orgIds.length > 0
-                    ? await db
-                          .select({
-                              orgId: orgs.orgId,
-                              name: orgs.name
-                          })
-                          .from(orgs)
-                          .where(inArray(orgs.orgId, orgIds))
-                    : [];
-            return response<DeleteMyAccountPreviewResponse>(res, {
-                data: {
-                    preview: true,
-                    orgs: orgsWithNames.map((o) => ({
-                        orgId: o.orgId,
-                        name: o.name ?? ""
-                    })),
-                    twoFactorEnabled: user.twoFactorEnabled ?? false
-                },
-                success: true,
-                error: false,
-                message: "Preview",
-                status: HttpCode.OK
-            });
-        }
-
-        const validPassword = await verifyPassword(
-            password,
-            user.passwordHash!
-        );
-        if (!validPassword) {
-            return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "Invalid password")
-            );
-        }
-
-        if (user.twoFactorEnabled) {
-            if (!code) {
-                return response<DeleteMyAccountCodeRequestedResponse>(res, {
-                    data: { codeRequested: true },
-                    success: true,
-                    error: false,
-                    message: "Two-factor code required",
-                    status: HttpCode.ACCEPTED
-                });
-            }
-            const validOTP = await verifyTotpCode(
-                code,
-                user.twoFactorSecret!,
-                user.userId
-            );
-            if (!validOTP) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        "The two-factor code you entered is incorrect"
-                    )
-                );
-            }
-        }
-
-        const allDeletedNewtIds: string[] = [];
-        const allOlmsToTerminate: string[] = [];
-
-        for (const row of ownedOrgsRows) {
-            try {
-                const result = await deleteOrgById(row.orgId);
-                allDeletedNewtIds.push(...result.deletedNewtIds);
-                allOlmsToTerminate.push(...result.olmsToTerminate);
-            } catch (err) {
-                logger.error(
-                    `Failed to delete org ${row.orgId} during account deletion`,
-                    err
-                );
-                return next(
-                    createHttpError(
-                        HttpCode.INTERNAL_SERVER_ERROR,
-                        "Failed to delete organization"
-                    )
-                );
-            }
-        }
-
-        sendTerminationMessages({
-            deletedNewtIds: allDeletedNewtIds,
-            olmsToTerminate: allOlmsToTerminate
-        });
-
-        await db.transaction(async (trx) => {
-            await trx.delete(users).where(eq(users.userId, userId));
-            await calculateUserClientsForOrgs(userId, trx);
-        });
-
-        try {
-            await invalidateSession(session.sessionId);
-        } catch (error) {
-            logger.error(
-                "Failed to invalidate session after account deletion",
-                error
-            );
-        }
-
-        const isSecure = req.protocol === "https";
-        res.setHeader("Set-Cookie", createBlankSessionTokenCookie(isSecure));
-
-        return response<DeleteMyAccountSuccessResponse>(res, {
-            data: { success: true },
-            success: true,
-            error: false,
-            message: "Account deleted successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred"
-            )
-        );
-    }
-}
--- a/server/routers/auth/index.ts
+++ b/server/routers/auth/index.ts
@@ -17,5 +17,4 @@ export * from "./securityKey";
 export * from "./startDeviceWebAuth";
 export * from "./verifyDeviceWebAuth";
 export * from "./pollDeviceWebAuth";
-export * from "./lookupUser";
-export * from "./deleteMyAccount";
+export * from "./lookupUser";
--- a/server/routers/badger/verifySession.ts
+++ b/server/routers/badger/verifySession.ts
@@ -797,7 +797,7 @@ async function notAllowed(
 ) {
    let loginPage: LoginPage | null = null;
    if (orgId) {
-        const subscribed = await isSubscribed( // this is fine because the org login page is only a saas feature
+        const subscribed = await isSubscribed(
            orgId,
            tierMatrix.loginPageDomain
        );
@@ -854,7 +854,7 @@ async function headerAuthChallenged(
 ) {
    let loginPage: LoginPage | null = null;
    if (orgId) {
-        const subscribed = await isSubscribed(orgId, tierMatrix.loginPageDomain); // this is fine because the org login page is only a saas feature
+        const subscribed = await isSubscribed(orgId, tierMatrix.loginPageDomain);
        if (subscribed) {
            loginPage = await getOrgLoginPage(orgId);
        }
--- a/server/routers/external.ts
+++ b/server/routers/external.ts
@@ -1164,7 +1164,6 @@ authRouter.post(
    auth.login
 );
 authRouter.post("/logout", auth.logout);
-authRouter.post("/delete-my-account", auth.deleteMyAccount);
 authRouter.post(
    "/lookup-user",
    rateLimit({
--- a/server/routers/org/deleteOrg.ts
+++ b/server/routers/org/deleteOrg.ts
@@ -1,12 +1,28 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
+import {
+    clients,
+    clientSiteResourcesAssociationsCache,
+    clientSitesAssociationsCache,
+    db,
+    domains,
+    olms,
+    orgDomains,
+    resources
+} from "@server/db";
+import { newts, newtSessions, orgs, sites, userActions } from "@server/db";
+import { eq, and, inArray, sql } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
+import { ActionsEnum, checkUserActionPermission } from "@server/auth/actions";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
+import { sendToClient } from "#dynamic/routers/ws";
+import { deletePeer } from "../gerbil/peers";
 import { OpenAPITags, registry } from "@server/openApi";
-import { deleteOrgById, sendTerminationMessages } from "@server/lib/deleteOrg";
+import { OlmErrorCodes } from "../olm/error";
+import { sendTerminateClient } from "../client/terminate";

 const deleteOrgSchema = z.strictObject({
    orgId: z.string()
@@ -40,9 +56,170 @@ export async function deleteOrg(
                )
            );
        }
+
        const { orgId } = parsedParams.data;
-        const result = await deleteOrgById(orgId);
-        sendTerminationMessages(result);
+
+        const [org] = await db
+            .select()
+            .from(orgs)
+            .where(eq(orgs.orgId, orgId))
+            .limit(1);
+
+        if (!org) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Organization with ID ${orgId} not found`
+                )
+            );
+        }
+        // we need to handle deleting each site
+        const orgSites = await db
+            .select()
+            .from(sites)
+            .where(eq(sites.orgId, orgId))
+            .limit(1);
+
+        const orgClients = await db
+            .select()
+            .from(clients)
+            .where(eq(clients.orgId, orgId));
+
+        const deletedNewtIds: string[] = [];
+        const olmsToTerminate: string[] = [];
+
+        await db.transaction(async (trx) => {
+            for (const site of orgSites) {
+                if (site.pubKey) {
+                    if (site.type == "wireguard") {
+                        await deletePeer(site.exitNodeId!, site.pubKey);
+                    } else if (site.type == "newt") {
+                        // get the newt on the site by querying the newt table for siteId
+                        const [deletedNewt] = await trx
+                            .delete(newts)
+                            .where(eq(newts.siteId, site.siteId))
+                            .returning();
+                        if (deletedNewt) {
+                            deletedNewtIds.push(deletedNewt.newtId);
+
+                            // delete all of the sessions for the newt
+                            await trx
+                                .delete(newtSessions)
+                                .where(
+                                    eq(newtSessions.newtId, deletedNewt.newtId)
+                                );
+                        }
+                    }
+                }
+
+                logger.info(`Deleting site ${site.siteId}`);
+                await trx.delete(sites).where(eq(sites.siteId, site.siteId));
+            }
+            for (const client of orgClients) {
+                const [olm] = await trx
+                    .select()
+                    .from(olms)
+                    .where(eq(olms.clientId, client.clientId))
+                    .limit(1);
+
+                if (olm) {
+                    olmsToTerminate.push(olm.olmId);
+                }
+
+                logger.info(`Deleting client ${client.clientId}`);
+                await trx
+                    .delete(clients)
+                    .where(eq(clients.clientId, client.clientId));
+
+                // also delete the associations
+                await trx
+                    .delete(clientSiteResourcesAssociationsCache)
+                    .where(
+                        eq(
+                            clientSiteResourcesAssociationsCache.clientId,
+                            client.clientId
+                        )
+                    );
+
+                await trx
+                    .delete(clientSitesAssociationsCache)
+                    .where(
+                        eq(
+                            clientSitesAssociationsCache.clientId,
+                            client.clientId
+                        )
+                    );
+            }
+
+            const allOrgDomains = await trx
+                .select()
+                .from(orgDomains)
+                .innerJoin(domains, eq(domains.domainId, orgDomains.domainId))
+                .where(
+                    and(
+                        eq(orgDomains.orgId, orgId),
+                        eq(domains.configManaged, false)
+                    )
+                );
+
+            // For each domain, check if it belongs to multiple organizations
+            const domainIdsToDelete: string[] = [];
+            for (const orgDomain of allOrgDomains) {
+                const domainId = orgDomain.domains.domainId;
+
+                // Count how many organizations this domain belongs to
+                const orgCount = await trx
+                    .select({ count: sql<number>`count(*)` })
+                    .from(orgDomains)
+                    .where(eq(orgDomains.domainId, domainId));
+
+                // Only delete the domain if it belongs to exactly 1 organization (the one being deleted)
+                if (orgCount[0].count === 1) {
+                    domainIdsToDelete.push(domainId);
+                }
+            }
+
+            // Delete domains that belong exclusively to this organization
+            if (domainIdsToDelete.length > 0) {
+                await trx
+                    .delete(domains)
+                    .where(inArray(domains.domainId, domainIdsToDelete));
+            }
+
+            // Delete resources
+            await trx.delete(resources).where(eq(resources.orgId, orgId));
+
+            await trx.delete(orgs).where(eq(orgs.orgId, orgId));
+        });
+
+        // Send termination messages outside of transaction to prevent blocking
+        for (const newtId of deletedNewtIds) {
+            const payload = {
+                type: `newt/wg/terminate`,
+                data: {}
+            };
+            // Don't await this to prevent blocking the response
+            sendToClient(newtId, payload).catch((error) => {
+                logger.error(
+                    "Failed to send termination message to newt:",
+                    error
+                );
+            });
+        }
+
+        for (const olmId of olmsToTerminate) {
+            sendTerminateClient(
+                0, // clientId not needed since we're passing olmId
+                OlmErrorCodes.TERMINATED_REKEYED,
+                olmId
+            ).catch((error) => {
+                logger.error(
+                    "Failed to send termination message to olm:",
+                    error
+                );
+            });
+        }
+
        return response(res, {
            data: null,
            success: true,
@@ -51,9 +228,6 @@ export async function deleteOrg(
            status: HttpCode.OK
        });
    } catch (error) {
-        if (createHttpError.isHttpError(error)) {
-            return next(error);
-        }
        logger.error(error);
        return next(
            createHttpError(
--- a/src/app/[orgId]/settings/(private)/billing/page.tsx
+++ b/src/app/[orgId]/settings/(private)/billing/page.tsx
@@ -61,7 +61,7 @@ import {
 import { FeatureId } from "@server/lib/billing/features";

 // Plan tier definitions matching the mockup
-type PlanId = "basic" | "home" | "team" | "business" | "enterprise";
+type PlanId = "starter" | "home" | "team" | "business" | "enterprise";

 type PlanOption = {
    id: PlanId;
@@ -73,8 +73,8 @@ type PlanOption = {

 const planOptions: PlanOption[] = [
    {
-        id: "basic",
-        name: "Basic",
+        id: "starter",
+        name: "Starter",
        price: "Free",
        tierType: null
    },
@@ -109,10 +109,10 @@ const planOptions: PlanOption[] = [

 // Tier limits mapping derived from limit sets
 const tierLimits: Record<
-    Tier | "basic",
+    Tier | "starter",
    { users: number; sites: number; domains: number; remoteNodes: number }
 > = {
-    basic: {
+    starter: {
        users: freeLimitSet[FeatureId.USERS]?.value ?? 0,
        sites: freeLimitSet[FeatureId.SITES]?.value ?? 0,
        domains: freeLimitSet[FeatureId.DOMAINS]?.value ?? 0,
@@ -183,7 +183,7 @@ export default function BillingPage() {
    // Confirmation dialog state
    const [showConfirmDialog, setShowConfirmDialog] = useState(false);
    const [pendingTier, setPendingTier] = useState<{
-        tier: Tier | "basic";
+        tier: Tier | "starter";
        action: "upgrade" | "downgrade";
        planName: string;
        price: string;
@@ -402,8 +402,8 @@ export default function BillingPage() {
            pendingTier.action === "upgrade" ||
            pendingTier.action === "downgrade"
        ) {
-            // If downgrading to basic (free tier), go to Stripe portal
-            if (pendingTier.tier === "basic") {
+            // If downgrading to starter (free tier), go to Stripe portal
+            if (pendingTier.tier === "starter") {
                handleModifySubscription();
            } else if (hasSubscription) {
                handleChangeTier(pendingTier.tier);
@@ -417,7 +417,7 @@ export default function BillingPage() {
    };

    const showTierConfirmation = (
-        tier: Tier | "basic",
+        tier: Tier | "starter",
        action: "upgrade" | "downgrade",
        planName: string,
        price: string
@@ -432,9 +432,9 @@ export default function BillingPage() {

    // Get current plan ID from tier
    const getCurrentPlanId = (): PlanId => {
-        if (!hasSubscription || !currentTier) return "basic";
+        if (!hasSubscription || !currentTier) return "starter";
        const plan = planOptions.find((p) => p.tierType === currentTier);
-        return plan?.id || "basic";
+        return plan?.id || "starter";
    };

    const currentPlanId = getCurrentPlanId();
@@ -451,8 +451,8 @@ export default function BillingPage() {
        }

        if (plan.id === currentPlanId) {
-            // If it's the basic plan (basic with no subscription), show as current but disabled
-            if (plan.id === "basic" && !hasSubscription) {
+            // If it's the starter plan (starter with no subscription), show as current but disabled
+            if (plan.id === "starter" && !hasSubscription) {
                return {
                    label: "Current Plan",
                    action: () => {},
@@ -484,10 +484,10 @@ export default function BillingPage() {
                            plan.name,
                            plan.price + (" " + plan.priceDetail || "")
                        );
-                    } else if (plan.id === "basic") {
-                        // Show confirmation for downgrading to basic (free tier)
+                    } else if (plan.id === "starter") {
+                        // Show confirmation for downgrading to starter (free tier)
                        showTierConfirmation(
-                            "basic",
+                            "starter",
                            "downgrade",
                            plan.name,
                            plan.price
@@ -566,7 +566,7 @@ export default function BillingPage() {
    };

    // Check if downgrading to a tier would violate current usage limits
-    const checkLimitViolations = (targetTier: Tier | "basic"): Array<{
+    const checkLimitViolations = (targetTier: Tier | "starter"): Array<{
        feature: string;
        currentUsage: number;
        newLimit: number;
--- a/src/app/auth/delete-account/DeleteAccountClient.tsx
+++ b/src/app/auth/delete-account/DeleteAccountClient.tsx
@@ -1,74 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { useRouter } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { Button } from "@app/components/ui/button";
-import DeleteAccountConfirmDialog from "@app/components/DeleteAccountConfirmDialog";
-import UserProfileCard from "@app/components/UserProfileCard";
-import { ArrowLeft } from "lucide-react";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { toast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/api";
-
-type DeleteAccountClientProps = {
-    displayName: string;
-};
-
-export default function DeleteAccountClient({
-    displayName
-}: DeleteAccountClientProps) {
-    const router = useRouter();
-    const t = useTranslations();
-    const { env } = useEnvContext();
-    const api = createApiClient({ env });
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-
-    function handleUseDifferentAccount() {
-        api.post("/auth/logout")
-            .catch((e) => {
-                console.error(t("logoutError"), e);
-                toast({
-                    title: t("logoutError"),
-                    description: formatAxiosError(e, t("logoutError"))
-                });
-            })
-            .then(() => {
-                router.push(
-                    "/auth/login?internal_redirect=/auth/delete-account"
-                );
-                router.refresh();
-            });
-    }
-
-    return (
-        <div className="space-y-6">
-            <UserProfileCard
-                identifier={displayName}
-                description={t("signingAs")}
-                onUseDifferentAccount={handleUseDifferentAccount}
-                useDifferentAccountText={t("deviceLoginUseDifferentAccount")}
-            />
-            <p className="text-sm text-muted-foreground">
-                {t("deleteAccountDescription")}
-            </p>
-            <div className="flex items-center gap-2">
-                <Button variant="outline" onClick={() => router.back()}>
-                    <ArrowLeft className="mr-2 h-4 w-4" />
-                    {t("back")}
-                </Button>
-                <Button
-                    variant="destructive"
-                    onClick={() => setIsDialogOpen(true)}
-                >
-                    {t("deleteAccountButton")}
-                </Button>
-            </div>
-            <DeleteAccountConfirmDialog
-                open={isDialogOpen}
-                setOpen={setIsDialogOpen}
-            />
-        </div>
-    );
-}
--- a/src/app/auth/delete-account/page.tsx
+++ b/src/app/auth/delete-account/page.tsx
@@ -1,28 +0,0 @@
-import { verifySession } from "@app/lib/auth/verifySession";
-import { redirect } from "next/navigation";
-import { build } from "@server/build";
-import { cache } from "react";
-import DeleteAccountClient from "./DeleteAccountClient";
-import { getTranslations } from "next-intl/server";
-import { getUserDisplayName } from "@app/lib/getUserDisplayName";
-
-export const dynamic = "force-dynamic";
-
-export default async function DeleteAccountPage() {
-    const getUser = cache(verifySession);
-    const user = await getUser({ skipCheckVerifyEmail: true });
-
-    if (!user) {
-        redirect("/auth/login");
-    }
-
-    const t = await getTranslations();
-    const displayName = getUserDisplayName({ user });
-
-    return (
-        <div className="space-y-4">
-            <h1 className="text-xl font-semibold">{t("deleteAccount")}</h1>
-            <DeleteAccountClient displayName={displayName} />
-        </div>
-    );
-}
--- a/src/components/ApplyInternalRedirect.tsx
+++ b/src/components/ApplyInternalRedirect.tsx
@@ -2,7 +2,7 @@

 import { useEffect } from "react";
 import { useRouter } from "next/navigation";
-import { getInternalRedirectTarget } from "@app/lib/internalRedirect";
+import { consumeInternalRedirectPath } from "@app/lib/internalRedirect";

 type ApplyInternalRedirectProps = {
    orgId: string;
@@ -14,9 +14,9 @@ export default function ApplyInternalRedirect({
    const router = useRouter();

    useEffect(() => {
-        const target = getInternalRedirectTarget(orgId);
-        if (target) {
-            router.replace(target);
+        const path = consumeInternalRedirectPath();
+        if (path) {
+            router.replace(`/${orgId}${path}`);
        }
    }, [orgId, router]);

--- a/src/components/DeleteAccountConfirmDialog.tsx
+++ b/src/components/DeleteAccountConfirmDialog.tsx
@@ -1,414 +0,0 @@
-"use client";
-
-import { useState, useEffect, useMemo } from "react";
-import { useRouter } from "next/navigation";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { formatAxiosError } from "@app/lib/api";
-import { toast } from "@app/hooks/useToast";
-import { useTranslations } from "next-intl";
-import { Button } from "@app/components/ui/button";
-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaClose,
-    CredenzaContent,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "@app/components/Credenza";
-import {
-    Form,
-    FormControl,
-    FormField,
-    FormItem,
-    FormLabel,
-    FormMessage
-} from "@app/components/ui/form";
-import { Input } from "@app/components/ui/input";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-import {
-    InputOTP,
-    InputOTPGroup,
-    InputOTPSlot
-} from "@app/components/ui/input-otp";
-import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
-import type {
-    DeleteMyAccountPreviewResponse,
-    DeleteMyAccountCodeRequestedResponse,
-    DeleteMyAccountSuccessResponse
-} from "@server/routers/auth/deleteMyAccount";
-import { AxiosResponse } from "axios";
-
-type DeleteAccountConfirmDialogProps = {
-    open: boolean;
-    setOpen: (open: boolean) => void;
-};
-
-export default function DeleteAccountConfirmDialog({
-    open,
-    setOpen
-}: DeleteAccountConfirmDialogProps) {
-    const { env } = useEnvContext();
-    const api = createApiClient({ env });
-    const router = useRouter();
-    const t = useTranslations();
-
-    const passwordSchema = useMemo(
-        () =>
-            z.object({
-                password: z.string().min(1, { message: t("passwordRequired") })
-            }),
-        [t]
-    );
-
-    const codeSchema = useMemo(
-        () =>
-            z.object({
-                code: z.string().length(6, { message: t("pincodeInvalid") })
-            }),
-        [t]
-    );
-
-    const [step, setStep] = useState<0 | 1 | 2>(0);
-    const [loading, setLoading] = useState(false);
-    const [loadingPreview, setLoadingPreview] = useState(false);
-    const [preview, setPreview] =
-        useState<DeleteMyAccountPreviewResponse | null>(null);
-    const [passwordValue, setPasswordValue] = useState("");
-
-    const passwordForm = useForm<z.infer<typeof passwordSchema>>({
-        resolver: zodResolver(passwordSchema),
-        defaultValues: { password: "" }
-    });
-
-    const codeForm = useForm<z.infer<typeof codeSchema>>({
-        resolver: zodResolver(codeSchema),
-        defaultValues: { code: "" }
-    });
-
-    useEffect(() => {
-        if (open && step === 0 && !preview) {
-            setLoadingPreview(true);
-            api.post<AxiosResponse<DeleteMyAccountPreviewResponse>>(
-                "/auth/delete-my-account",
-                {}
-            )
-                .then((res) => {
-                    if (res.data?.data?.preview) {
-                        setPreview(res.data.data);
-                    }
-                })
-                .catch((err) => {
-                    toast({
-                        variant: "destructive",
-                        title: t("deleteAccountError"),
-                        description: formatAxiosError(
-                            err,
-                            t("deleteAccountError")
-                        )
-                    });
-                    setOpen(false);
-                })
-                .finally(() => setLoadingPreview(false));
-        }
-    }, [open, step, preview, api, setOpen, t]);
-
-    function reset() {
-        setStep(0);
-        setPreview(null);
-        setPasswordValue("");
-        passwordForm.reset();
-        codeForm.reset();
-    }
-
-    async function handleContinueToPassword() {
-        setStep(1);
-    }
-
-    async function handlePasswordSubmit(
-        values: z.infer<typeof passwordSchema>
-    ) {
-        setLoading(true);
-        setPasswordValue(values.password);
-        try {
-            const res = await api.post<
-                | AxiosResponse<DeleteMyAccountCodeRequestedResponse>
-                | AxiosResponse<DeleteMyAccountSuccessResponse>
-            >("/auth/delete-my-account", { password: values.password });
-
-            const data = res.data?.data;
-
-            if (data && "codeRequested" in data && data.codeRequested) {
-                setStep(2);
-            } else if (data && "success" in data && data.success) {
-                toast({
-                    title: t("deleteAccountSuccess"),
-                    description: t("deleteAccountSuccessMessage")
-                });
-                setOpen(false);
-                reset();
-                router.push("/auth/login");
-                router.refresh();
-            }
-        } catch (err) {
-            toast({
-                variant: "destructive",
-                title: t("deleteAccountError"),
-                description: formatAxiosError(err, t("deleteAccountError"))
-            });
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    async function handleCodeSubmit(values: z.infer<typeof codeSchema>) {
-        setLoading(true);
-        try {
-            const res = await api.post<
-                AxiosResponse<DeleteMyAccountSuccessResponse>
-            >("/auth/delete-my-account", {
-                password: passwordValue,
-                code: values.code
-            });
-
-            if (res.data?.data?.success) {
-                toast({
-                    title: t("deleteAccountSuccess"),
-                    description: t("deleteAccountSuccessMessage")
-                });
-                setOpen(false);
-                reset();
-                router.push("/auth/login");
-                router.refresh();
-            }
-        } catch (err) {
-            toast({
-                variant: "destructive",
-                title: t("deleteAccountError"),
-                description: formatAxiosError(err, t("deleteAccountError"))
-            });
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    return (
-        <Credenza
-            open={open}
-            onOpenChange={(val) => {
-                setOpen(val);
-                if (!val) reset();
-            }}
-        >
-            <CredenzaContent>
-                <CredenzaHeader>
-                    <CredenzaTitle>
-                        {t("deleteAccountConfirmTitle")}
-                    </CredenzaTitle>
-                </CredenzaHeader>
-                <CredenzaBody>
-                    <div className="space-y-4">
-                        {step === 0 && (
-                            <>
-                                {loadingPreview ? (
-                                    <p className="text-sm text-muted-foreground">
-                                        {t("loading")}...
-                                    </p>
-                                ) : preview ? (
-                                    <>
-                                        <p className="text-sm text-muted-foreground">
-                                            {t("deleteAccountConfirmMessage")}
-                                        </p>
-                                        <div className="rounded-md bg-muted p-3 space-y-2">
-                                            <p className="text-sm font-medium">
-                                                {t(
-                                                    "deleteAccountPreviewAccount"
-                                                )}
-                                            </p>
-                                            {preview.orgs.length > 0 && (
-                                                <>
-                                                    <p className="text-sm font-medium mt-2">
-                                                        {t(
-                                                            "deleteAccountPreviewOrgs"
-                                                        )}
-                                                    </p>
-                                                    <ul className="list-disc list-inside text-sm text-muted-foreground space-y-1">
-                                                        {preview.orgs.map(
-                                                            (org) => (
-                                                                <li
-                                                                    key={
-                                                                        org.orgId
-                                                                    }
-                                                                >
-                                                                    {org.name ||
-                                                                        org.orgId}
-                                                                </li>
-                                                            )
-                                                        )}
-                                                    </ul>
-                                                </>
-                                            )}
-                                        </div>
-                                        <p className="text-sm font-bold text-destructive">
-                                            {t("cannotbeUndone")}
-                                        </p>
-                                    </>
-                                ) : null}
-                            </>
-                        )}
-
-                        {step === 1 && (
-                            <Form {...passwordForm}>
-                                <form
-                                    id="delete-account-password-form"
-                                    onSubmit={passwordForm.handleSubmit(
-                                        handlePasswordSubmit
-                                    )}
-                                    className="space-y-4"
-                                >
-                                    <FormField
-                                        control={passwordForm.control}
-                                        name="password"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <FormLabel>
-                                                    {t("password")}
-                                                </FormLabel>
-                                                <FormControl>
-                                                    <Input
-                                                        type="password"
-                                                        autoComplete="current-password"
-                                                        {...field}
-                                                    />
-                                                </FormControl>
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-                                </form>
-                            </Form>
-                        )}
-
-                        {step === 2 && (
-                            <div className="space-y-4">
-                                <div className="text-center">
-                                    <p className="text-sm text-muted-foreground">
-                                        {t("otpAuthDescription")}
-                                    </p>
-                                </div>
-                                <Form {...codeForm}>
-                                    <form
-                                        id="delete-account-code-form"
-                                        onSubmit={codeForm.handleSubmit(
-                                            handleCodeSubmit
-                                        )}
-                                        className="space-y-4"
-                                    >
-                                        <FormField
-                                            control={codeForm.control}
-                                            name="code"
-                                            render={({ field }) => (
-                                                <FormItem>
-                                                    <FormControl>
-                                                        <div className="flex justify-center">
-                                                            <InputOTP
-                                                                maxLength={6}
-                                                                {...field}
-                                                                pattern={
-                                                                    REGEXP_ONLY_DIGITS_AND_CHARS
-                                                                }
-                                                                onChange={(
-                                                                    value: string
-                                                                ) => {
-                                                                    field.onChange(
-                                                                        value
-                                                                    );
-                                                                }}
-                                                            >
-                                                                <InputOTPGroup>
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            0
-                                                                        }
-                                                                    />
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            1
-                                                                        }
-                                                                    />
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            2
-                                                                        }
-                                                                    />
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            3
-                                                                        }
-                                                                    />
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            4
-                                                                        }
-                                                                    />
-                                                                    <InputOTPSlot
-                                                                        index={
-                                                                            5
-                                                                        }
-                                                                    />
-                                                                </InputOTPGroup>
-                                                            </InputOTP>
-                                                        </div>
-                                                    </FormControl>
-                                                    <FormMessage />
-                                                </FormItem>
-                                            )}
-                                        />
-                                    </form>
-                                </Form>
-                            </div>
-                        )}
-                    </div>
-                </CredenzaBody>
-                <CredenzaFooter>
-                    <CredenzaClose asChild>
-                        <Button variant="outline">{t("close")}</Button>
-                    </CredenzaClose>
-                    {step === 0 && preview && !loadingPreview && (
-                        <Button
-                            variant="destructive"
-                            onClick={handleContinueToPassword}
-                        >
-                            {t("continue")}
-                        </Button>
-                    )}
-                    {step === 1 && (
-                        <Button
-                            variant="destructive"
-                            type="submit"
-                            form="delete-account-password-form"
-                            loading={loading}
-                            disabled={loading}
-                        >
-                            {t("deleteAccountButton")}
-                        </Button>
-                    )}
-                    {step === 2 && (
-                        <Button
-                            variant="destructive"
-                            type="submit"
-                            form="delete-account-code-form"
-                            loading={loading}
-                            disabled={loading}
-                        >
-                            {t("deleteAccountButton")}
-                        </Button>
-                    )}
-                </CredenzaFooter>
-            </CredenzaContent>
-        </Credenza>
-    );
-}
--- a/src/components/ProfileIcon.tsx
+++ b/src/components/ProfileIcon.tsx
@@ -15,11 +15,9 @@ import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { formatAxiosError } from "@app/lib/api";
 import { getUserDisplayName } from "@app/lib/getUserDisplayName";
-import { Laptop, LogOut, Moon, Sun, Smartphone, Trash2 } from "lucide-react";
+import { Laptop, LogOut, Moon, Sun, Smartphone } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useRouter } from "next/navigation";
-import Link from "next/link";
-import { build } from "@server/build";
 import { useState } from "react";
 import { useUserContext } from "@app/hooks/useUserContext";
 import Disable2FaForm from "./Disable2FaForm";
@@ -189,20 +187,6 @@ export default function ProfileIcon() {
                    <DropdownMenuSeparator />
                    <LocaleSwitcher />
                    <DropdownMenuSeparator />
-                    {user?.type === UserType.Internal && !user?.serverAdmin && (
-                        <>
-                            <DropdownMenuItem asChild>
-                                <Link
-                                    href="/auth/delete-account"
-                                    className="flex cursor-pointer items-center"
-                                >
-                                    <Trash2 className="mr-2 h-4 w-4" />
-                                    <span>{t("deleteAccount")}</span>
-                                </Link>
-                            </DropdownMenuItem>
-                            <DropdownMenuSeparator />
-                        </>
-                    )}
                    <DropdownMenuItem onClick={() => logout()}>
                        {/* <LogOut className="mr-2 h-4 w-4" /> */}
                        <span>{t("logout")}</span>
--- a/src/components/RedirectToOrg.tsx
+++ b/src/components/RedirectToOrg.tsx
@@ -13,8 +13,7 @@ export default function RedirectToOrg({ targetOrgId }: RedirectToOrgProps) {

    useEffect(() => {
        try {
-            const target =
-                getInternalRedirectTarget(targetOrgId) ?? `/${targetOrgId}`;
+            const target = getInternalRedirectTarget(targetOrgId);
            router.replace(target);
        } catch {
            router.replace(`/${targetOrgId}`);
--- a/src/lib/internalRedirect.ts
+++ b/src/lib/internalRedirect.ts
@@ -41,12 +41,11 @@ export function consumeInternalRedirectPath(): string | null {
 }

 /**
- * Returns the full redirect target if a valid internal_redirect was stored
- * (consumes the stored value). Returns null if none was stored or expired.
- * Paths starting with /auth/ are returned as-is; others are prefixed with orgId.
+ * Returns the full redirect target for an org: either `/${orgId}` or
+ * `/${orgId}${path}` if a valid internal_redirect was stored. Consumes the
+ * stored value.
 */
-export function getInternalRedirectTarget(orgId: string): string | null {
+export function getInternalRedirectTarget(orgId: string): string {
    const path = consumeInternalRedirectPath();
-    if (!path) return null;
-    return path.startsWith("/auth/") ? path : `/${orgId}${path}`;
+    return path ? `/${orgId}${path}` : `/${orgId}`;
 }
Author	SHA1	Message	Date
Owen Schwartz	ca9a6e725e	New translations en-us.json (Norwegian Bokmal)	2026-02-14 18:15:51 -08:00
Owen Schwartz	f061cdaa1f	New translations en-us.json (Chinese Simplified)	2026-02-14 18:15:49 -08:00
Owen Schwartz	2105a680ba	New translations en-us.json (Turkish)	2026-02-14 18:15:48 -08:00
Owen Schwartz	5e29495aff	New translations en-us.json (Russian)	2026-02-14 18:15:47 -08:00
Owen Schwartz	02b7feab90	New translations en-us.json (Portuguese)	2026-02-14 18:15:45 -08:00
Owen Schwartz	14c4946659	New translations en-us.json (Polish)	2026-02-14 18:15:43 -08:00
Owen Schwartz	7d3750addd	New translations en-us.json (Dutch)	2026-02-14 18:15:42 -08:00
Owen Schwartz	4db02eb94c	New translations en-us.json (Korean)	2026-02-14 18:15:41 -08:00
Owen Schwartz	a0134a5bb5	New translations en-us.json (Italian)	2026-02-14 18:15:39 -08:00
Owen Schwartz	f4579ec61f	New translations en-us.json (German)	2026-02-14 18:15:38 -08:00
Owen Schwartz	947c195d10	New translations en-us.json (Czech)	2026-02-14 18:15:37 -08:00
Owen Schwartz	dfeb945164	New translations en-us.json (Bulgarian)	2026-02-14 18:15:35 -08:00
Owen Schwartz	3288b3cb3f	New translations en-us.json (Spanish)	2026-02-14 18:15:34 -08:00
Owen Schwartz	dcae516a8a	New translations en-us.json (French)	2026-02-14 18:15:32 -08:00
Owen Schwartz	d2d30cd82e	New translations en-us.json (Norwegian Bokmal)	2026-02-14 12:34:30 -08:00
Owen Schwartz	4613d90eaf	New translations en-us.json (Chinese Simplified)	2026-02-14 12:34:29 -08:00
Owen Schwartz	4b3a172720	New translations en-us.json (Turkish)	2026-02-14 12:34:27 -08:00
Owen Schwartz	715654dd96	New translations en-us.json (Russian)	2026-02-14 12:34:26 -08:00
Owen Schwartz	fb1a9f5849	New translations en-us.json (Portuguese)	2026-02-14 12:34:25 -08:00
Owen Schwartz	b783dc62c0	New translations en-us.json (Polish)	2026-02-14 12:34:23 -08:00
Owen Schwartz	83b5e20b1b	New translations en-us.json (Dutch)	2026-02-14 12:34:22 -08:00
Owen Schwartz	ab2ec7129c	New translations en-us.json (Korean)	2026-02-14 12:34:21 -08:00
Owen Schwartz	9d31147750	New translations en-us.json (Italian)	2026-02-14 12:34:20 -08:00
Owen Schwartz	38ae15bad5	New translations en-us.json (German)	2026-02-14 12:34:18 -08:00
Owen Schwartz	2d52748fbc	New translations en-us.json (Czech)	2026-02-14 12:34:17 -08:00
Owen Schwartz	5e14b57f90	New translations en-us.json (Bulgarian)	2026-02-14 12:34:16 -08:00
Owen Schwartz	a2528fe8f9	New translations en-us.json (Spanish)	2026-02-14 12:34:14 -08:00
Owen Schwartz	6068d8b554	New translations en-us.json (French)	2026-02-14 12:34:13 -08:00
Owen Schwartz	4ca54a6c5b	New translations en-us.json (Norwegian Bokmal)	2026-02-13 18:31:27 -08:00
Owen Schwartz	274faded45	New translations en-us.json (Chinese Simplified)	2026-02-13 18:31:26 -08:00
Owen Schwartz	7eebd77aa3	New translations en-us.json (Turkish)	2026-02-13 18:31:25 -08:00
Owen Schwartz	99278f9961	New translations en-us.json (Russian)	2026-02-13 18:31:23 -08:00
Owen Schwartz	ceb9cd38eb	New translations en-us.json (Portuguese)	2026-02-13 18:31:22 -08:00
Owen Schwartz	687eda132a	New translations en-us.json (Polish)	2026-02-13 18:31:21 -08:00
Owen Schwartz	3ebd7bee63	New translations en-us.json (Dutch)	2026-02-13 18:31:19 -08:00
Owen Schwartz	4584d9ddb1	New translations en-us.json (Korean)	2026-02-13 18:31:18 -08:00
Owen Schwartz	97a0c65137	New translations en-us.json (Italian)	2026-02-13 18:31:17 -08:00
Owen Schwartz	f28925347c	New translations en-us.json (German)	2026-02-13 18:31:15 -08:00
Owen Schwartz	220e6c0aca	New translations en-us.json (Czech)	2026-02-13 18:31:14 -08:00
Owen Schwartz	dd56706624	New translations en-us.json (Bulgarian)	2026-02-13 18:31:12 -08:00
Owen Schwartz	597ef725c4	New translations en-us.json (Spanish)	2026-02-13 18:31:10 -08:00
Owen Schwartz	39e7655327	New translations en-us.json (French)	2026-02-13 18:31:09 -08:00
Owen Schwartz	829e324217	New translations en-us.json (Norwegian Bokmal)	2026-02-13 17:18:44 -08:00
Owen Schwartz	59ce52ce83	New translations en-us.json (Chinese Simplified)	2026-02-13 17:18:43 -08:00
Owen Schwartz	43f602a005	New translations en-us.json (Turkish)	2026-02-13 17:18:41 -08:00
Owen Schwartz	c4643d9bcb	New translations en-us.json (Russian)	2026-02-13 17:18:40 -08:00
Owen Schwartz	ea5fa998c1	New translations en-us.json (Portuguese)	2026-02-13 17:18:38 -08:00
Owen Schwartz	9258ffda77	New translations en-us.json (Polish)	2026-02-13 17:18:37 -08:00
Owen Schwartz	103b89a171	New translations en-us.json (Dutch)	2026-02-13 17:18:35 -08:00
Owen Schwartz	336d94bc43	New translations en-us.json (Korean)	2026-02-13 17:18:34 -08:00
Owen Schwartz	f1dfac1192	New translations en-us.json (Italian)	2026-02-13 17:18:33 -08:00
Owen Schwartz	93f09b9c1b	New translations en-us.json (German)	2026-02-13 17:18:31 -08:00
Owen Schwartz	e2d940e477	New translations en-us.json (Czech)	2026-02-13 17:18:30 -08:00
Owen Schwartz	2a99bdadd8	New translations en-us.json (Bulgarian)	2026-02-13 17:18:29 -08:00
Owen Schwartz	b2af60055b	New translations en-us.json (Spanish)	2026-02-13 17:18:27 -08:00
Owen Schwartz	540bafb730	New translations en-us.json (French)	2026-02-13 17:18:26 -08:00