diff --git a/src/hlfmt.c b/src/hlfmt.c
index 1440899bb..c775cd5d8 100644
--- a/src/hlfmt.c
+++ b/src/hlfmt.c
@@ -28,7 +28,11 @@ static void hlfmt_hash_hashcat (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, char *l
   const user_options_t *user_options = hashcat_ctx->user_options;
   const hashconfig_t   *hashconfig   = hashcat_ctx->hashconfig;
 
-  if (user_options->username == true)
+  if ((user_options->username == true) && (user_options->dynamic_x == true))
+  {
+
+  }
+  else if (user_options->username == true)
   {
     char  *pos = line_buf;
     size_t len = line_len;
@@ -48,7 +52,7 @@ static void hlfmt_hash_hashcat (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, char *l
     *hashbuf_pos = pos;
     *hashbuf_len = len;
   }
-  if (user_options->dynamic_x == true)
+  else if (user_options->dynamic_x == true)
   {
 
   }