diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index fbf2c88..32b31ad 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -2,8 +2,9 @@
 
 $config = array();
 
-$config['db_dsnw'] = 'pgsql://{{getenv "DBUSER"}}:{{getenv "DBPASSWORD"}}@{{getenv "DBHOST"}}/DBNAME';
+$config['db_dsnw'] = 'pgsql://{{getenv "DBUSER"}}:{{getenv "DBPASSWORD"}}@{{getenv "DBHOST"}}/{{getenv "DBNAME"}}';
 $config['log_driver'] = 'syslog';
+$config['syslog_id'] = 'mail';
 
 $config['default_host'] = '{{getenv "IMAPHOST"}}';
 
diff --git a/rootfs/etc/rsyslog.conf b/rootfs/etc/rsyslog.conf
index 994aef9..6faafe2 100644
--- a/rootfs/etc/rsyslog.conf
+++ b/rootfs/etc/rsyslog.conf
@@ -26,7 +26,6 @@ authpriv.*                                              action(type="omfile" fil
 
 # Log all the mail messages in one place.
 mail.*                                                  action(type="omfile" file="/dev/console")
-roundcube.*                                                  action(type="omfile" file="/dev/console")
 
 # Log cron stuff
 cron.*                                                  action(type="omfile" file="/var/log/cron")