diff --git a/jslib b/jslib
index bbcbd6d119..20ac5a98a3 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit bbcbd6d119396e80d02849c67204fa53434896e6
+Subproject commit 20ac5a98a3c9e796b26fb7e59d33c426e3d9fb81
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 6d3d91a42c..c29bdcb226 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -148,6 +148,11 @@
             <code>python Desktop/pw_helper.py export Desktop/my_passwords.json</code>. Then upload the resulting
             <code>my_passwords.json</code> file here to Bitwarden.
         </ng-container>
+        <ng-container *ngIf="format === 'passwordagentcsv'">
+            Using the Password Agent desktop application navigate to "File" &rarr; "Export", select the "Fields to export" button and
+            check all of the fields, change the "Output format" to "CSV", and then click the "Start" button to save the CSV
+            file.
+        </ng-container>
     </app-callout>
     <div class="row">
         <div class="col-6">
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index f152a810d1..7181e9eb36 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -42,6 +42,7 @@ import { OnePassword1PifImporter } from 'jslib/importers/onepassword1PifImporter
 import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImporter';
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
 import { PassKeepCsvImporter } from 'jslib/importers/passkeepCsvImporter';
+import { PasswordAgentCsvImporter } from 'jslib/importers/passwordAgentCsvImporter';
 import { PasswordBossJsonImporter } from 'jslib/importers/passwordBossJsonImporter';
 import { PasswordDragonXmlImporter } from 'jslib/importers/passwordDragonXmlImporter';
 import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter';
@@ -224,6 +225,7 @@ export class ImportComponent implements OnInit {
             { id: 'vivaldicsv', name: 'Vivaldi (csv)' },
             { id: 'gnomejson', name: 'GNOME Passwords and Keys/Seahorse (json)' },
             { id: 'blurcsv', name: 'Blur (csv)' },
+            { id: 'passwordagentcsv', name: 'Password Agent (csv)' },
         ];
     }
 
@@ -298,6 +300,8 @@ export class ImportComponent implements OnInit {
                 return new PassKeepCsvImporter();
             case 'gnomejson':
                 return new GnomeJsonImporter();
+            case 'passwordagentcsv':
+                return new PasswordAgentCsvImporter();
             default:
                 return null;
         }