diff --git a/src/cli.rs b/src/cli.rs
index c4239de..c620eba 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -181,7 +181,8 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             } else {
                 None
             };
-            let cred = make_credential_id(Some(name.as_ref()), pin, &[])?;
+            let cred =
+                make_credential_id(Some(name.as_str()).filter(|name| name.len() > 0), pin, &[])?;
             println!("{}", hex::encode(&cred.id));
             Ok(())
         }
diff --git a/src/cli_args/mod.rs b/src/cli_args/mod.rs
index 618b8f2..c36df7d 100644
--- a/src/cli_args/mod.rs
+++ b/src/cli_args/mod.rs
@@ -257,7 +257,7 @@ pub enum Command {
         #[structopt(flatten)]
         authenticator: AuthenticatorParameters,
         /// Name to be displayed on the authenticator display
-        #[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME", default_value = "fido2luks")]
+        #[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME", default_value = "")]
         name: String,
     },
     /// Check if an authenticator is connected