diff --git a/jslib b/jslib
index 27566c3fd5..3b22df15e8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 27566c3fd5a1040112278c7ad0a50c6b8d45e3e4
+Subproject commit 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0
diff --git a/src/app/organizations/tools/export.component.ts b/src/app/organizations/tools/export.component.ts
index 957f6db70c..7c8cccdf46 100644
--- a/src/app/organizations/tools/export.component.ts
+++ b/src/app/organizations/tools/export.component.ts
@@ -28,7 +28,7 @@ export class ExportComponent extends BaseExportComponent {
     }
 
     getExportData() {
-        return this.exportService.getOrganizationExport(this.organizationId, 'csv');
+        return this.exportService.getOrganizationExport(this.organizationId, this.format);
     }
 
     getFileName() {
diff --git a/src/app/tools/export.component.html b/src/app/tools/export.component.html
index a9dd4c8064..c000b73e5c 100644
--- a/src/app/tools/export.component.html
+++ b/src/app/tools/export.component.html
@@ -3,7 +3,7 @@
         <h1>{{'exportVault' | i18n}}</h1>
     </div>
     <p>{{'exportMasterPassword' | i18n}}</p>
-    <app-callout type="warning">{{'exportWarning' | i18n}}</app-callout>
+    <app-callout type="warning">{{'exportWarningDesc' | i18n}}</app-callout>
     <div class="row">
         <div class="form-group col-6">
             <label for="masterPassword">{{'masterPass' | i18n}}</label>
@@ -11,6 +11,15 @@
                 appInputVerbatim>
         </div>
     </div>
+    <div class="row">
+        <div class="form-group col-6">
+            <label for="format">{{'fileFormat' | i18n}}</label>
+            <select class="form-control" id="format" name="Format" [(ngModel)]="format">
+                <option value="json">.json</option>
+                <option value="csv">.csv</option>
+            </select>
+        </div>
+    </div>
     <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
         <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'exportVault' | i18n}}</span>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 3a4aec9d88..48ecdfd48f 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -774,8 +774,8 @@
   "warning": {
     "message": "Warning"
   },
-  "exportWarning": {
-    "message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after you are done using it."
+  "exportWarningDesc": {
+    "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
   },
   "exportMasterPassword": {
     "message": "Enter your master password to export your vault data."
@@ -783,6 +783,9 @@
   "exportVault": {
     "message": "Export Vault"
   },
+  "fileFormat": {
+    "message": "File Format"
+  },
   "exportSuccess": {
     "message": "Your vault data has been exported."
   },