diff --git a/CHANGELOG.md b/CHANGELOG.md
index bded5d8..96565fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ##### git
 - Add compatibility with browserpass via `--pass-compat=browserpass`
+- Add compatibility mode `username` for a `username:` prefix
 
 ##### 0.7.0
 - Fix PK11 slot memory leak
diff --git a/firefox_decrypt.py b/firefox_decrypt.py
index 97616f3..5fa7c9d 100755
--- a/firefox_decrypt.py
+++ b/firefox_decrypt.py
@@ -760,9 +760,10 @@ def parse_sys_args():
                         help="Path to profile folder (default: {0})".format(profile_path))
     parser.add_argument("-e", "--export-pass", action="store_true",
                         help="Export URL, username and password to pass from passwordstore.org")
-    parser.add_argument("--pass-compat", action="store", choices={"default", "browserpass"},
+    parser.add_argument("--pass-compat", action="store",
+                        choices={"default", "browserpass", "username"},
                         default="default",
-                        help="Export username as is (default), or prefixed with `login:` for compatibility with browserpass")
+                        help="Export username as is (default), or with one of the compatiblity modes")
     parser.add_argument("-p", "--pass-prefix", action="store", default=u"web",
                         help="Prefix for export to pass from passwordstore.org (default: %(default)s)")
     parser.add_argument("-f", "--format", action="store", choices={"csv", "human"},
@@ -853,7 +854,13 @@ def main():
     )
 
     if args.export_pass:
-        username_prefix = "login: " if args.pass_compat == "browserpass" else ""
+        # List of compatibility modes for username prefixes
+        compat = {
+            "username": "username: ",
+            "browserpass": "login: ",
+        }
+
+        username_prefix = compat.get(args.pass_compat, "")
         export_pass(to_export, args.pass_prefix, username_prefix)
 
     # And shutdown NSS