diff --git a/client/resources/aidlist.json b/client/resources/aidlist.json
index ec88ebdfc..ff709d710 100644
--- a/client/resources/aidlist.json
+++ b/client/resources/aidlist.json
@@ -839,6 +839,14 @@
         "Description": "PIV Authentication Key",
         "Type": ""
     },
+    {
+        "AID": "A0000006472F0001",
+        "Vendor": "FIDO authenticator",
+        "Country": "global",
+        "Name": "U2F/FIDO2 authenticator",
+        "Description": "U2F and/or FIDO2 authenticator",
+        "Type": ""
+    },
     {
         "AID": "A000000116DB00",
         "Vendor": "GSA - TFCS",
diff --git a/client/resources/fido2_defparams.json b/client/resources/hf_fido2_defparams.json
similarity index 100%
rename from client/resources/fido2_defparams.json
rename to client/resources/hf_fido2_defparams.json
diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c
index f68e6a23d..64ab28687 100644
--- a/client/src/cmdhffido.c
+++ b/client/src/cmdhffido.c
@@ -38,7 +38,7 @@
 #include "fileutils.h"   // laodFileJSONroot
 
 #define DEF_FIDO_SIZE        2048
-#define DEF_FIDO_PARAM_FILE  "fido2_defparams.json"
+#define DEF_FIDO_PARAM_FILE  "hf_fido2_defparams.json"
 
 static int CmdHelp(const char *Cmd);
 
@@ -654,7 +654,9 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf fido make",
                   "Execute a FIDO2 Make Credential command. Needs json file with parameters.\n"
-                  "Sample file `fido2_defparams.json` in `client/resources/`.",
+                  "Sample file `fido2_defparams.json` in `client/resources/`.\n"
+                  "- for yubikey there must be only one option `\"rk\": true` or false"
+                  ,
                   "hf fido make               --> use default parameters file `fido2_defparams.json`\n"
                   "hf fido make -f test.json  --> use parameters file `text.json`"
                  );
@@ -772,7 +774,8 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
     CLIParserInit(&ctx, "hf fido assert",
                   "Execute a FIDO2 Get Assertion command. Needs json file with parameters.\n"
                   "Sample file `fido2_defparams.json` in `client/resources/`.\n"
-                  "- Needs if `rk` option is `false` (authenticator doesn't store credential to its memory)"
+                  "- Needs if `rk` option is `false` (authenticator doesn't store credential to its memory)\n"
+                  "- for yubikey there must be only one option `\"up\": true` or false"
                   ,
                   "hf fido assert                  --> default parameters file `fido2_defparams.json`\n"
                   "hf fido assert -f test.json -l  --> use parameters file `text.json` and add to request CredentialId");