diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain
index 9d5bb1547..1ba782dbc 100755
--- a/bin/v-delete-remote-dns-domain
+++ b/bin/v-delete-remote-dns-domain
@@ -49,7 +49,7 @@ old_ifs="$IFS"
 IFS=$'\n'
 
 # Starting cluster loop
-for cluster_str in $(grep SUSPENDED='no' $VESTA/conf/dns-cluster.conf); do
+for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
 
     # Get host values
     eval $cluster_str
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index 7634e5fa5..4661cf017 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -73,7 +73,7 @@ fi
 
 # Checking proxy SSL
 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
-    tpl_file="$WEBTPL/$PROXY_SSL/$PROXY.stpl"
+    tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
diff --git a/install/rhel/roundcube-main.conf b/install/rhel/roundcube-main.conf
index 14122d5f1..a6e1fc2ee 100644
--- a/install/rhel/roundcube-main.conf
+++ b/install/rhel/roundcube-main.conf
@@ -439,7 +439,7 @@ $rcmail_config['trash_mbox'] = 'Trash';
 $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash');
 
 // automatically create the above listed default folders on first login
-$rcmail_config['create_default_folders'] = false;
+$rcmail_config['create_default_folders'] = true;
 
 // protect the default folders from renames, deletes, and subscription changes
 $rcmail_config['protect_default_folders'] = true;