diff --git a/jslib b/jslib
index a6a0673af8..4004449aa8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a6a0673af8eb11ebe1afc7324751c6ab0a6e338b
+Subproject commit 4004449aa833a2a445fcdb2a9c80f4a014de0b89
diff --git a/src/app/organizations/tools/import.component.ts b/src/app/organizations/tools/import.component.ts
index 24a44d35c6..9e1e3f6690 100644
--- a/src/app/organizations/tools/import.component.ts
+++ b/src/app/organizations/tools/import.component.ts
@@ -62,8 +62,8 @@ export class ImportComponent extends BaseImportComponent {
             }
         }
         if (importResult.collectionRelationships != null) {
-            importResult.collectionRelationships.forEach((v: number, k: number) =>
-                request.collectionRelationships.push(new KvpRequest(k, v)));
+            importResult.collectionRelationships.forEach((r) =>
+                request.collectionRelationships.push(new KvpRequest(r[0], r[1])));
         }
         return await this.apiService.postImportOrganizationCiphers(this.organizationId, request);
     }
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index 8398b83990..5ae65a84c8 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -27,6 +27,7 @@ import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
 import { Importer } from 'jslib/importers/importer';
 import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
 import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
+import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
 import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
 
 @Component({
@@ -153,8 +154,8 @@ export class ImportComponent implements OnInit {
             }
         }
         if (importResult.folderRelationships != null) {
-            importResult.folderRelationships.forEach((v: number, k: number) =>
-                request.folderRelationships.push(new KvpRequest(k, v)));
+            importResult.folderRelationships.forEach((r) =>
+                request.folderRelationships.push(new KvpRequest(r[0], r[1])));
         }
         return await this.apiService.postImportCiphers(request);
     }
@@ -219,6 +220,8 @@ export class ImportComponent implements OnInit {
                 return new BlurCsvImporter();
             case 'safeincloudxml':
                 return new SafeInCloudXmlImporter();
+            case 'padlockcsv':
+                return new PadlockCsvImporter();
             default:
                 return null;
         }