diff --git a/g10/gpg.c b/g10/gpg.c
index 2c3cd925f..466a48d9d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2422,7 +2422,7 @@ main (int argc, char **argv)
     gnupg_rl_initialize ();
     gpgrt_set_strusage (my_strusage);
     gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
-    log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX);
+    log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
     /* Make sure that our subsystems are ready.  */
     i18n_init();
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 9e9a2297f..4634fba74 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -901,7 +901,7 @@ main ( int argc, char **argv)
   /* Please note that we may running SUID(ROOT), so be very CAREFUL
      when adding any stuff between here and the call to secmem_init()
      somewhere after the option parsing */
-  log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 142f69143..cecebf676 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1196,7 +1196,8 @@ main (int argc, char **argv)
   early_system_init ();
   gnupg_rl_initialize ();
   gpgrt_set_strusage (my_strusage);
-  log_set_prefix ("gpg-connect-agent", GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix ("gpg-connect-agent",
+                  GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index dbda45046..ff6db42d5 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -620,7 +620,7 @@ main (int argc, char **argv)
   early_system_init ();
   gnupg_reopen_std (GPGCONF_NAME);
   gpgrt_set_strusage (my_strusage);
-  log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
@@ -1321,6 +1321,7 @@ show_other_registry_entries (estream_t outfp)
     { 1, "HKLM\\Software\\Gpg4win:Desktop-Version" },
     { 1, "HKLM\\Software\\Gpg4win:VS-Desktop-Version" },
     { 1, "\\" GNUPG_REGISTRY_DIR ":HomeDir" },
+    { 1, "\\" GNUPG_REGISTRY_DIR ":DefaultLogFile" },
     { 2, "Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL"
       ":LoadBehavior" },
     { 2, "HKCU\\Software\\Microsoft\\Office\\16.0\\Outlook\\Options\\Mail:"