diff --git a/src/bridges.c b/src/bridges.c
index 9b37aa25a..3df210f80 100644
--- a/src/bridges.c
+++ b/src/bridges.c
@@ -87,12 +87,12 @@ bool bridges_init (hashcat_ctx_t *hashcat_ctx)
   user_options_t  *user_options = hashcat_ctx->user_options;
   hashconfig_t    *hashconfig   = hashcat_ctx->hashconfig;
 
-  if (user_options->hash_info    == true) return true;
+  if (user_options->backend_info  > 0)    return true;
+  if (user_options->hash_info     > 0)    return true;
+  if (user_options->usage         > 0)    return true;
   if (user_options->left         == true) return true;
   if (user_options->show         == true) return true;
-  if (user_options->usage         > 0)    return true;
   if (user_options->version      == true) return true;
-  if (user_options->backend_info  > 0)    return true;
 
   // There is a problem here. At this point, hashconfig is not yet initialized.
   // This is because initializing hashconfig requires the module to be loaded,
@@ -241,12 +241,12 @@ bool bridges_salt_prepare (hashcat_ctx_t *hashcat_ctx)
   hashes_t        *hashes       = hashcat_ctx->hashes;
   user_options_t  *user_options = hashcat_ctx->user_options;
 
-  if (user_options->hash_info    == true) return true;
+  if (user_options->backend_info  > 0)    return true;
+  if (user_options->hash_info     > 0)    return true;
+  if (user_options->usage         > 0)    return true;
   if (user_options->left         == true) return true;
   if (user_options->show         == true) return true;
-  if (user_options->usage         > 0)    return true;
   if (user_options->version      == true) return true;
-  if (user_options->backend_info  > 0)    return true;
 
   if (bridge_ctx->enabled == false) return true;
 
diff --git a/src/hashes.c b/src/hashes.c
index 40d94941f..767c30824 100644
--- a/src/hashes.c
+++ b/src/hashes.c
@@ -1133,7 +1133,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
 
     hashes_cnt = 1;
   }
-  else if (user_options->hash_info == true)
+  else if (user_options->hash_info > 0)
   {
   }
   else if (user_options->keyspace == true)
diff --git a/src/mpsp.c b/src/mpsp.c
index 3efe345d7..0d2ae9ae0 100644
--- a/src/mpsp.c
+++ b/src/mpsp.c
@@ -1403,8 +1403,8 @@ int mask_ctx_init (hashcat_ctx_t *hashcat_ctx)
 
   if (user_options->usage         > 0)    return 0;
   if (user_options->backend_info  > 0)    return 0;
+  if (user_options->hash_info     > 0)    return 0;
 
-  if (user_options->hash_info    == true) return 0;
   if (user_options->left         == true) return 0;
   if (user_options->show         == true) return 0;
   if (user_options->version      == true) return 0;
diff --git a/src/outfile_check.c b/src/outfile_check.c
index e681b7263..afee8ddb8 100644
--- a/src/outfile_check.c
+++ b/src/outfile_check.c
@@ -343,13 +343,13 @@ int outcheck_ctx_init (hashcat_ctx_t *hashcat_ctx)
 
   outcheck_ctx->enabled = false;
 
+  if (user_options->backend_info   > 0)    return 0;
+  if (user_options->hash_info      > 0)    return 0;
   if (user_options->keyspace      == true) return 0;
   if (user_options->benchmark     == true) return 0;
-  if (user_options->hash_info     == true) return 0;
   if (user_options->speed_only    == true) return 0;
   if (user_options->progress_only == true) return 0;
   if (user_options->identify      == true) return 0;
-  if (user_options->backend_info   > 0)    return 0;
 
   if (hashconfig->outfile_check_disable == true) return 0;
   if (user_options->outfile_check_timer == 0)    return 0;
diff --git a/src/potfile.c b/src/potfile.c
index afafca2f1..9a87ed027 100644
--- a/src/potfile.c
+++ b/src/potfile.c
@@ -115,9 +115,9 @@ int potfile_init (hashcat_ctx_t *hashcat_ctx)
 
   if (user_options->usage            > 0)     return 0;
   if (user_options->backend_info     > 0)     return 0;
+  if (user_options->hash_info        > 0)     return 0;
 
   if (user_options->benchmark       == true)  return 0;
-  if (user_options->hash_info       == true)  return 0;
   if (user_options->keyspace        == true)  return 0;
   if (user_options->stdout_flag     == true)  return 0;
   if (user_options->speed_only      == true)  return 0;
diff --git a/src/restore.c b/src/restore.c
index 2ca95ba92..e5c141bfc 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -312,9 +312,9 @@ int restore_ctx_init (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
 
   if (user_options->usage            > 0)     return 0;
   if (user_options->backend_info     > 0)     return 0;
+  if (user_options->hash_info        > 0)     return 0;
 
   if (user_options->benchmark       == true)  return 0;
-  if (user_options->hash_info       == true)  return 0;
   if (user_options->keyspace        == true)  return 0;
   if (user_options->left            == true)  return 0;
   if (user_options->show            == true)  return 0;
diff --git a/src/straight.c b/src/straight.c
index 36d3a8eb8..58212be52 100644
--- a/src/straight.c
+++ b/src/straight.c
@@ -264,11 +264,11 @@ int straight_ctx_init (hashcat_ctx_t *hashcat_ctx)
 
   if (user_options->usage         > 0)    return 0;
   if (user_options->backend_info  > 0)    return 0;
+  if (user_options->hash_info     > 0)    return 0;
 
   if (user_options->left         == true) return 0;
   if (user_options->show         == true) return 0;
   if (user_options->version      == true) return 0;
-  if (user_options->hash_info    == true) return 0;
 
   if (user_options->attack_mode  == ATTACK_MODE_BF) return 0;
 
diff --git a/src/tuningdb.c b/src/tuningdb.c
index 41d3795aa..2c507feb7 100644
--- a/src/tuningdb.c
+++ b/src/tuningdb.c
@@ -56,8 +56,8 @@ int tuning_db_init (hashcat_ctx_t *hashcat_ctx)
 
   if (user_options->usage         > 0)    return 0;
   if (user_options->backend_info  > 0)    return 0;
+  if (user_options->hash_info     > 0)    return 0;
 
-  if (user_options->hash_info    == true) return 0;
   if (user_options->keyspace     == true) return 0;
   if (user_options->left         == true) return 0;
   if (user_options->show         == true) return 0;
diff --git a/src/wordlist.c b/src/wordlist.c
index 1776b4885..bfe09de89 100644
--- a/src/wordlist.c
+++ b/src/wordlist.c
@@ -697,9 +697,9 @@ int wl_data_init (hashcat_ctx_t *hashcat_ctx)
 
   if (user_options->usage         > 0)    return 0;
   if (user_options->backend_info  > 0)    return 0;
+  if (user_options->hash_info     > 0)    return 0;
 
   if (user_options->benchmark    == true) return 0;
-  if (user_options->hash_info    == true) return 0;
   if (user_options->left         == true) return 0;
   if (user_options->version      == true) return 0;