diff --git a/setup/mail-dovecot.sh b/setup/mail-dovecot.sh
index 46f5ae6f..2c4378a6 100755
--- a/setup/mail-dovecot.sh
+++ b/setup/mail-dovecot.sh
@@ -70,7 +70,6 @@ cp conf/dovecot/conf.d/15-mailboxes.conf /etc/dovecot/conf.d/
 cp conf/dovecot/conf.d/20-imap.conf /etc/dovecot/conf.d/
 cp conf/dovecot/conf.d/90-quota.conf /etc/dovecot/conf.d/
 cp conf/dovecot/dovecot-sql.conf.ext /etc/dovecot/
-cp conf/roundcube/config.inc.php /usr/local/lib/roundcubemail/config/
 
 # ### IMAP/POP
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index b0e11c9b..078f4143 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -127,7 +127,7 @@ cat > $RCM_CONFIG <<EOF;
 \$config['login_autocomplete'] = 2;
 \$config['password_charset'] = 'UTF-8';
 \$config['junk_mbox'] = 'Spam';
-?>
+\$config['quota_zero_as_unlimited'] = true;
 EOF
 
 # Configure CardDav