diff --git a/jslib b/jslib
index 9c0b4b89738..4228277d235 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9c0b4b897387045d08c5e9651ba4c103379d3ac6
+Subproject commit 4228277d23503d563560b44a652293d23233aa1b
diff --git a/src/app/organizations/settings/organization-billing.component.html b/src/app/organizations/settings/organization-billing.component.html
index cc6d7324c4f..b5316ea6ca0 100644
--- a/src/app/organizations/settings/organization-billing.component.html
+++ b/src/app/organizations/settings/organization-billing.component.html
@@ -79,8 +79,10 @@
             <button type="button" class="btn btn-outline-secondary" (click)="changePlan()">
                 {{'changeBillingPlan' | i18n}}
             </button>
-            <button type="button" class="btn btn-outline-secondary ml-1" (click)="downloadLicense()" *ngIf="subscription && !subscription.cancelled">
-                {{'downloadLicense' | i18n}}
+            <button type="button" class="btn btn-outline-secondary btn-submit ml-1" #licenseBtn [appApiAction]="licensePromise" [disabled]="licenseBtn.loading"
+                (click)="downloadLicense()" *ngIf="subscription && !subscription.cancelled">
+                <i class="fa fa-spinner fa-spin"></i>
+                <span>{{'downloadLicense' | i18n}}</span>
             </button>
             <button #cancelBtn type="button" class="btn btn-outline-danger btn-submit ml-auto" (click)="cancel()" [appApiAction]="cancelPromise"
                 [disabled]="cancelBtn.loading" *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/organization-billing.component.ts
index a85cec74094..7e3a394914e 100644
--- a/src/app/organizations/settings/organization-billing.component.ts
+++ b/src/app/organizations/settings/organization-billing.component.ts
@@ -40,6 +40,7 @@ export class OrganizationBillingComponent implements OnInit {
 
     cancelPromise: Promise<any>;
     reinstatePromise: Promise<any>;
+    licensePromise: Promise<any>;
 
     constructor(private tokenService: TokenService, private apiService: ApiService,
         private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
@@ -113,10 +114,22 @@ export class OrganizationBillingComponent implements OnInit {
         }
     }
 
-    downloadLicense() {
+    async downloadLicense() {
         if (this.loading) {
             return;
         }
+
+        const installationId = window.prompt(this.i18nService.t('enterInstallationId'));
+        if (installationId == null || installationId === '') {
+            return;
+        }
+
+        try {
+            this.licensePromise = this.apiService.getOrganizationLicense(this.organizationId, installationId);
+            const license = await this.licensePromise;
+            const licenseString = JSON.stringify(license, null, 2);
+            this.platformUtilsService.saveFile(window, licenseString, null, 'bitwarden_organization_license.json');
+        } catch { }
     }
 
     updateLicense() {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 71e35d0fc28..edfd40306cc 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2219,5 +2219,8 @@
   },
   "bankAccountTypeIndividual": {
     "message": "Individual (Personal)"
+  },
+  "enterInstallationId": {
+    "message": "Enter your installation id"
   }
 }