diff --git a/include/logfile.h b/include/logfile.h
index 3f3be0b29..fde68d2a7 100644
--- a/include/logfile.h
+++ b/include/logfile.h
@@ -13,16 +13,16 @@
 
 // logfile_append() checks for logfile_disable internally to make it easier from here
 
-#define logfile_top_msg(msg)                               logfile_append ("%s\t%s",                  data.topid,             (msg));
-#define logfile_sub_msg(msg)                               logfile_append ("%s\t%s\t%s",              data.topid, data.subid, (msg));
-#define logfile_top_var_uint64(var,val)                    logfile_append ("%s\t%s\t%" PRIu64 "",     data.topid,             (var), (val));
-#define logfile_sub_var_uint64(var,val)                    logfile_append ("%s\t%s\t%s\t%" PRIu64 "", data.topid, data.subid, (var), (val));
-#define logfile_top_var_uint(var,val)                      logfile_append ("%s\t%s\t%u",              data.topid,             (var), (val));
-#define logfile_sub_var_uint(var,val)                      logfile_append ("%s\t%s\t%s\t%u",          data.topid, data.subid, (var), (val));
-#define logfile_top_var_char(var,val)                      logfile_append ("%s\t%s\t%c",              data.topid,             (var), (val));
-#define logfile_sub_var_char(var,val)                      logfile_append ("%s\t%s\t%s\t%c",          data.topid, data.subid, (var), (val));
-#define logfile_top_var_string(var,val) if ((val) != NULL) logfile_append ("%s\t%s\t%s",              data.topid,             (var), (val));
-#define logfile_sub_var_string(var,val) if ((val) != NULL) logfile_append ("%s\t%s\t%s\t%s",          data.topid, data.subid, (var), (val));
+#define logfile_top_msg(msg)                               logfile_append (user_options, "%s\t%s",                  data.topid,             (msg));
+#define logfile_sub_msg(msg)                               logfile_append (user_options, "%s\t%s\t%s",              data.topid, data.subid, (msg));
+#define logfile_top_var_uint64(var,val)                    logfile_append (user_options, "%s\t%s\t%" PRIu64 "",     data.topid,             (var), (val));
+#define logfile_sub_var_uint64(var,val)                    logfile_append (user_options, "%s\t%s\t%s\t%" PRIu64 "", data.topid, data.subid, (var), (val));
+#define logfile_top_var_uint(var,val)                      logfile_append (user_options, "%s\t%s\t%u",              data.topid,             (var), (val));
+#define logfile_sub_var_uint(var,val)                      logfile_append (user_options, "%s\t%s\t%s\t%u",          data.topid, data.subid, (var), (val));
+#define logfile_top_var_char(var,val)                      logfile_append (user_options, "%s\t%s\t%c",              data.topid,             (var), (val));
+#define logfile_sub_var_char(var,val)                      logfile_append (user_options, "%s\t%s\t%s\t%c",          data.topid, data.subid, (var), (val));
+#define logfile_top_var_string(var,val) if ((val) != NULL) logfile_append (user_options, "%s\t%s\t%s",              data.topid,             (var), (val));
+#define logfile_sub_var_string(var,val) if ((val) != NULL) logfile_append (user_options, "%s\t%s\t%s\t%s",          data.topid, data.subid, (var), (val));
 
 #define logfile_top_uint64(var) logfile_top_var_uint64 (#var, (var));
 #define logfile_sub_uint64(var) logfile_sub_var_uint64 (#var, (var));
@@ -36,6 +36,6 @@
 char *logfile_generate_topid (void);
 char *logfile_generate_subid (void);
 
-void logfile_append (const char *fmt, ...);
+void logfile_append (const user_options_t *user_options, const char *fmt, ...);
 
 #endif // _LOGFILE_H
diff --git a/include/types.h b/include/types.h
index 0afaa2cd3..abdb80cd4 100644
--- a/include/types.h
+++ b/include/types.h
@@ -936,7 +936,6 @@ typedef struct
    * logging
    */
 
-  u32     logfile_disable;
   char   *logfile;
   char   *topid;
   char   *subid;
diff --git a/src/hashcat.c b/src/hashcat.c
index 20a32b644..e64bf3342 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -272,7 +272,6 @@ int main (int argc, char **argv)
   {
     data.attack_mode = user_options->attack_mode;
     data.force = user_options->force;
-    data.logfile_disable = user_options->logfile_disable;
     data.quiet = user_options->quiet;
     data.attack_kern = user_options_extra->attack_kern;
   }
diff --git a/src/logfile.c b/src/logfile.c
index de2f12a1e..c5b8769b5 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -53,9 +53,9 @@ static void logfile_close (FILE *fp)
   fclose (fp);
 }
 
-void logfile_append (const char *fmt, ...)
+void logfile_append (const user_options_t *user_options, const char *fmt, ...)
 {
-  if (data.logfile_disable == 1) return;
+  if (user_options->logfile_disable == true) return;
 
   FILE *fp = logfile_open (data.logfile);