diff --git a/src/warden-client/etc/warden-client.conf b/src/warden-client/etc/warden-client.conf
index fb571e344a52fc4d3da3692c0fcf6bba8801cd15..c274a42e53d727437295d54205662b8af01b3c58 100644
--- a/src/warden-client/etc/warden-client.conf
+++ b/src/warden-client/etc/warden-client.conf
@@ -31,7 +31,7 @@ $SSL_CA_CERT = "/etc/ssl/certs/tcs-ca-bundle.pem";
 #                        consumes app. 250 MB of memory
 #-------------------------------------------------------------------------------
 $MAX_RCV_EVENTS_LIMIT = 6000;
- 
+
 #-------------------------------------------------------------------------------
 # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden
 #                      server. If your client timeouts, consider using higher
@@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = 60;
 $LOG_STDERR = 1;
 
 #-------------------------------------------------------------------------------
-# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
+# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack
+#                      info added) if reporting to stderr is enabled only
 #-------------------------------------------------------------------------------
-$LOG_VERBOSE = 1;
+$LOG_STDERR_VERBOSE = 0;
 
 #-------------------------------------------------------------------------------
 # SYSLOG - enable/disable syslog logging
 #-------------------------------------------------------------------------------
 $SYSLOG = 1;
 
+#-------------------------------------------------------------------------------
+# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info
+#                  added) if syslog logging is enabled only
+#-------------------------------------------------------------------------------
+$SYSLOG_VERBOSE = 0;
+
 #-------------------------------------------------------------------------------
 # SYSLOG_FACILITY - syslog facility
 #-------------------------------------------------------------------------------
diff --git a/src/warden-client/etc/warden-client.conf.tmpl b/src/warden-client/etc/warden-client.conf.tmpl
index f31fe2a751f499660a7ee76cdefd9f06ae13e0d2..d9d79eb03d17bb6ac47253848b526eb374bd8a91 100644
--- a/src/warden-client/etc/warden-client.conf.tmpl
+++ b/src/warden-client/etc/warden-client.conf.tmpl
@@ -31,7 +31,7 @@ $SSL_CA_CERT = "_CAFILE_";
 #                        consumes app. 250 MB of memory
 #-------------------------------------------------------------------------------
 $MAX_RCV_EVENTS_LIMIT = 6000;
- 
+
 #-------------------------------------------------------------------------------
 # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden
 #                      server. If your client timeouts, consider using higher
@@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = 60;
 $LOG_STDERR = 1;
 
 #-------------------------------------------------------------------------------
-# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
+# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack
+#                      info added) if reporting to stderr is enabled only
 #-------------------------------------------------------------------------------
-$LOG_VERBOSE = 1;
+$LOG_STDERR_VERBOSE = 0;
 
 #-------------------------------------------------------------------------------
 # SYSLOG - enable/disable syslog logging
 #-------------------------------------------------------------------------------
 $SYSLOG = 1;
 
+#-------------------------------------------------------------------------------
+# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info
+#                  added) if syslog logging is enabled only
+#-------------------------------------------------------------------------------
+$SYSLOG_VERBOSE = 0;
+
 #-------------------------------------------------------------------------------
 # SYSLOG_FACILITY - syslog facility
 #-------------------------------------------------------------------------------
diff --git a/src/warden-client/etc/warden-client.conf.tmpl.update b/src/warden-client/etc/warden-client.conf.tmpl.update
index 113b751203226ca61d1954720a38d034fb48234c..814482f5d0c8aff5308b47419b86e124cdd6eb02 100644
--- a/src/warden-client/etc/warden-client.conf.tmpl.update
+++ b/src/warden-client/etc/warden-client.conf.tmpl.update
@@ -31,7 +31,7 @@ $SSL_CA_CERT = "_CAFILE_";
 #                        consumes app. 250 MB of memory
 #-------------------------------------------------------------------------------
 $MAX_RCV_EVENTS_LIMIT = _MAXRCVEVENTSLIMIT_;
- 
+
 #-------------------------------------------------------------------------------
 # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden
 #                      server. If your client timeouts, consider using higher
@@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = _CONNECTIONTIMEOUT_;
 $LOG_STDERR = _LOGSTDERR_;
 
 #-------------------------------------------------------------------------------
-# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
+# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack
+#                      info added) if reporting to stderr is enabled only
 #-------------------------------------------------------------------------------
-$LOG_VERBOSE = _LOGVERBOSE_;
+$LOG_STDERR_VERBOSE = _LOGSTDERRVERBOSW_;
 
 #-------------------------------------------------------------------------------
 # SYSLOG - enable/disable syslog logging
 #-------------------------------------------------------------------------------
 $SYSLOG = _SYSLOG_;
 
+#-------------------------------------------------------------------------------
+# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info
+#                  added) if syslog logging is enabled only
+#-------------------------------------------------------------------------------
+$SYSLOG_VERBOSE = _SYSLOGVERBOSE_;
+
 #-------------------------------------------------------------------------------
 # SYSLOG_FACILITY - syslog facility
 #-------------------------------------------------------------------------------