diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index a415959bb..1c102b81c 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -128,7 +128,7 @@ fi
 
 # Adding zone in named.conf
 named="zone \"$domain_idn\" {type master; file"
-named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
+named="$named \"$VESTA/data/users/$user/conf/dns/$domain.db\";};"
 echo "$named" >> $dns_conf
 
 # Updating domain dns zone
diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record
index 075586f89..891f20fde 100755
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@@ -33,20 +33,6 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
-# Null priority for none MX/SRV records
-if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
-    priority=''
-fi
-
-# Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-fqdn_type=$(echo $rtype | grep "[NS|CNAME|MX|PTR|SRV]")
-if [ ! -z "$fqdn_type" ]; then
-    trailing_dot=$(echo $dvalue | grep "\.$")
-    if [ -z $trailing_dot ]; then
-        dvalue="$dvalue."
-    fi
-fi
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #
@@ -63,14 +49,16 @@ is_package_full 'DNS_RECORDS'
 get_next_dnsrecord
 validate_format 'id'
 is_object_new "dns/$domain" 'ID' "$id"
-is_dns_fqnd "$rtype" "$dvalue"
-is_dns_nameserver_valid "$domain" "$rtype" "$dvalue"
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
+if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
+    priority=''
+fi
+
 # Adding record
 zone="$USER_DATA/dns/$domain.conf"
 dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
@@ -79,7 +67,7 @@ echo "$dns_rec" >> $zone
 chmod 660 $zone
 
 # Sorting records
-sort_dns_records
+sort_dns_records 
 
 # Updating zone
 update_domain_zone
diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account
index 2c0d7ce8e..dbaf60a0c 100755
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -55,7 +55,7 @@ else
 fi
 
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias
index 844e58051..0f57ead89 100755
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@@ -45,7 +45,7 @@ is_mail_new "$malias"
 
 # Adding exim alias
 str="$malias@$domain:$account@$domain"
-echo "$str" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+echo "$str" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply
index ab0e57b9e..c8177de5a 100755
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@@ -43,7 +43,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #                       Action                             #
 #----------------------------------------------------------#
 # Add exim autoreply
-echo -e "$autoreply" > $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+echo -e "$autoreply" > $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 
 # Set ownership and permissions
 if [ "$MAIL_SYSTEM" = 'exim' ]; then
@@ -52,8 +52,8 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown $mail_user:mail $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+chown $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward
index f566c14fa..b6994a170 100755
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@@ -55,8 +55,8 @@ else
     fwd="$fwd,$forward"
 fi
 
-sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$account@$domain:/ d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "$account@$domain:$fwd" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only
index 9baffc14a..3746d45e2 100755
--- a/bin/v-add-mail-account-fwd-only
+++ b/bin/v-add-mail-account-fwd-only
@@ -48,10 +48,10 @@ fi
 #----------------------------------------------------------#
 
 # Adding account to fwd_only
-touch $HOMEDIR/$user/conf/mail/$domain/fwd_only
-check_fwd=$(grep "^$account$" $HOMEDIR/$user/conf/mail/$domain/fwd_only)
+touch $VESTA/data/users/$user/conf/mail/$domain/fwd_only
+check_fwd=$(grep "^$account$" $VESTA/data/users/$user/conf/mail/$domain/fwd_only)
 if [ -z "$check_fwd" ]; then
-    echo "$account" > $HOMEDIR/$user/conf/mail/$domain/fwd_only
+    echo "$account" > $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 fi
 
 # Set ownership
@@ -61,7 +61,7 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown -R $mail_user:mail $HOMEDIR/$user/conf/mail/$domain/fwd_only
+chown -R $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index 1051567db..ed2f7cac7 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -44,22 +44,22 @@ is_package_full 'MAIL_DOMAINS'
 #----------------------------------------------------------#
 
 # Adding domain directory and necessary files
-mkdir $HOMEDIR/$user/conf/mail/$domain
+mkdir $VESTA/data/users/$user/conf/mail/$domain
 mkdir $HOMEDIR/$user/mail/$domain_idn
-touch $HOMEDIR/$user/conf/mail/$domain/aliases
-touch $HOMEDIR/$user/conf/mail/$domain/passwd
+touch $VESTA/data/users/$user/conf/mail/$domain/aliases
+touch $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 # Adding symlink
-ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
+ln -s $VESTA/data/users/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
 
 # Adding antispam protection
 if [ "$antispam" = 'yes' ]; then
-    touch $HOMEDIR/$user/conf/mail/$domain/antispam
+    touch $VESTA/data/users/$user/conf/mail/$domain/antispam
 fi
 
 # Adding antivirus protection
 if [ "$antivirus" = 'yes' ]; then
-    touch $HOMEDIR/$user/conf/mail/$domain/antivirus
+    touch $VESTA/data/users/$user/conf/mail/$domain/antivirus
 fi
 
 # Adding dkim
@@ -69,7 +69,7 @@ if [ "$dkim" = 'yes' ]; then
         -out $USER_DATA/mail/$domain.pub &>/dev/null
     chmod 660 $USER_DATA/mail/$domain.*
 
-    cp $USER_DATA/mail/$domain.pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+    cp $USER_DATA/mail/$domain.pem $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
     # Adding dkim dns records
     check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
@@ -92,8 +92,8 @@ s="$s DATE='$DATE'"
 
 # Set permissions
 chmod 660 $USER_DATA/mail/$domain.*
-chmod 771 $HOMEDIR/$user/conf/mail/$domain
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/*
+chmod 771 $VESTA/data/users/$user/conf/mail/$domain
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/*
 chmod 771 /etc/$MAIL_SYSTEM/domains/$domain_idn
 chmod 770 $HOMEDIR/$user/mail/$domain_idn
 
@@ -104,8 +104,8 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown -R $mail_user:mail $HOMEDIR/$user/conf/mail/$domain
-chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+chown -R $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain
+chown -R dovecot:mail $VESTA/data/users/$user/conf/mail/$domain/passwd
 chown $user:mail $HOMEDIR/$user/mail/$domain_idn
 
 echo $s >> $USER_DATA/mail.conf
diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam
index e15b379e0..0acbdeb2f 100755
--- a/bin/v-add-mail-domain-antispam
+++ b/bin/v-add-mail-domain-antispam
@@ -40,7 +40,7 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
 #----------------------------------------------------------#
 
 # Adding antispam flag
-touch $HOMEDIR/$user/conf/mail/$domain/antispam
+touch $VESTA/data/users/$user/conf/mail/$domain/antispam
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus
index 2f55abad6..5826550bc 100755
--- a/bin/v-add-mail-domain-antivirus
+++ b/bin/v-add-mail-domain-antivirus
@@ -40,7 +40,7 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
 #----------------------------------------------------------#
 
 # Adding antivirus flag
-touch $HOMEDIR/$user/conf/mail/$domain/antivirus
+touch $VESTA/data/users/$user/conf/mail/$domain/antivirus
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall
index 213feeb56..7094c0f04 100755
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@@ -41,8 +41,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 #----------------------------------------------------------#
 
 # Adding catchall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "*@$domain:$email" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim
index 8c4726c51..3ff9dcd25 100755
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@@ -47,9 +47,9 @@ openssl rsa -pubout -in $USER_DATA/mail/$domain.pem \
 chmod 660 $USER_DATA/mail/$domain.*
 
 # Adding dkim to config
-cp $USER_DATA/mail/$domain.pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem
-chown exim:mail $HOMEDIR/$user/conf/mail/$domain/dkim.pem
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+cp $USER_DATA/mail/$domain.pem $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
+chown exim:mail $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
 # Checking dns domain
 check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
diff --git a/bin/v-add-user b/bin/v-add-user
index 0bda5b0bb..eada30edf 100755
--- a/bin/v-add-user
+++ b/bin/v-add-user
@@ -73,13 +73,13 @@ fi
 echo "$user:$password" | /usr/sbin/chpasswd
 
 # Building directory tree
-mkdir $HOMEDIR/$user/conf
+#mkdir $HOMEDIR/$user/conf
 
 if [ ! -z "$WEB_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/web
+    mkdir $VESTA/data/users/$user/conf/web
     mkdir $HOMEDIR/$user/web
     mkdir $HOMEDIR/$user/tmp
-    chmod 751 $HOMEDIR/$user/conf/web
+    chmod 751 $VESTA/data/users/$user/conf/web
     chmod 751 $HOMEDIR/$user/web
     chmod 771 $HOMEDIR/$user/tmp
     chown $user:$user $HOMEDIR/$user/web
@@ -87,21 +87,21 @@ if [ ! -z "$WEB_SYSTEM" ]; then
 fi
 
 if [ ! -z "$MAIL_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/mail
+    mkdir $VESTA/data/users/$user/conf/mail
     mkdir $HOMEDIR/$user/mail
     chmod 751 $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/conf/mail
+    chmod 751 $VESTA/data/users/$user/conf/mail
 fi
 
 if [ ! -z "$DNS_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/dns
-    chmod 751 $HOMEDIR/$user/conf/dns
+    mkdir $VESTA/data/users/$user/conf/dns
+    chmod 751 $VESTA/data/users/$user/conf/dns
 fi 
 
 
 # Set permissions
-chmod a+x $HOMEDIR/$user
-chattr +i $HOMEDIR/$user/conf
+#chmod a+x $HOMEDIR/$user
+#chattr +i $HOMEDIR/$user/conf
 
 # Checking quota
 if [ ! -z "$DISK_QUOTA" ]; then
diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index 898d1e15d..7e71b512d 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -78,7 +78,7 @@ group="$user"
 email="info@$domain"
 docroot="$HOMEDIR/$user/web/$domain/public_html"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$template.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 
 # Adding web config
 add_web_config
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
index 7a27c822a..2c3c27027 100755
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@@ -50,7 +50,7 @@ is_package_full 'WEB_ALIASES'
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Parsing domain aliases
@@ -69,7 +69,7 @@ add_web_config
 
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -77,13 +77,13 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
         add_web_config
     fi
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
index 6a0745b6a..972ce992a 100755
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@@ -54,7 +54,7 @@ get_domain_values 'web'
 PROXY="$template"
 PROXY_EXT="$extentions"
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Preparing domain values for the template substitution
@@ -74,7 +74,7 @@ fi
 # Checking ssl
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     add_web_config
 
     chown root:$user $conf
diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl
index af8cb0790..c37f3f225 100755
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@@ -36,7 +36,6 @@ source $VESTA/conf/vesta.conf
 check_args '3' "$#" 'USER DOMAIN SSL_DIR [SSL_HOME] [RESTART]'
 validate_format 'user' 'domain' 'ssl_dir'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
-is_system_enabled "$WEB_SSL" 'SSL_SUPPORT'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
@@ -62,7 +61,7 @@ chmod 660 $USER_DATA/ssl/$domain.*
 
 # Parsing domain values
 get_domain_values 'web'
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
 SSL_HOME="$ssl_home"
 ip=$(get_real_ip $IP)
@@ -77,11 +76,11 @@ chown root:$user $conf
 chmod 640 $conf
 
 # Adding certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $VESTA/data/users/$user/conf/web/ssl.$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $VESTA/data/users/$user/conf/web/ssl.$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $VESTA/data/users/$user/conf/web/ssl.$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $VESTA/data/users/$user/conf/web/ssl.$domain.ca
 fi
 
 # Running template trigger
@@ -97,7 +96,7 @@ fi
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     add_web_config
 
diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats
index 5d6056d18..4273b46ca 100755
--- a/bin/v-add-web-domain-stats
+++ b/bin/v-add-web-domain-stats
@@ -66,11 +66,11 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s/%home%/${HOMEDIR////\/}/g" \
         -e "s/%alias%/${aliases//,/ }/g" \
         -e "s/%alias_idn%/${aliases_idn//,/ }/g" \
-    > $HOMEDIR/$user/conf/web/$type.$domain.conf
+    > $VESTA/data/users/$user/conf/web/$type.$domain.conf
 
 if [ "$type" == 'awstats' ]; then
     rm -f /etc/awstats/$type.$domain_idn.conf
-    ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
+    ln -s $VESTA/data/users/$user/conf/web/$type.$domain.conf \
         /etc/awstats/$type.$domain_idn.conf
 else
     mkdir -p /var/lib/webalizer
diff --git a/bin/v-backup-user b/bin/v-backup-user
index 2b73eb501..7ae1c5315 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -9,9 +9,6 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Importing system variables
-source /etc/profile
-
 # Argument defenition
 user=$1
 notify=${2-no}
@@ -168,14 +165,14 @@ then
 
         # WEB config
         tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-        conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
         get_web_config_brds
         sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
 
         # SSL check
         if [ "$SSL" = 'yes' ]; then
             tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-            conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf
         fi
@@ -183,27 +180,27 @@ then
         # Proxy config
         if [ ! -z "$PROXY" ]; then
             tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-            conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf
 
         # SSL proxy config
         if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then
             tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-            conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf
             fi
         fi
 
         # Suplemental configs
-        for sconfig in $(ls $HOMEDIR/$user/conf/web/|grep ".$domain.conf"); do
-            cp $HOMEDIR/$user/conf/web/$sconfig conf/
+        for sconfig in $(ls $VESTA/data/users/$user/conf/web/|grep ".$domain.conf"); do
+            cp $VESTA/data/users/$user/conf/web/$sconfig conf/
         done
 
         # SSL Certificates
         if [ "$SSL" = 'yes' ] ; then
-            cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
+            cp $VESTA/data/users/$user/conf/web/ssl.$domain.* conf/
             cp $USER_DATA/ssl/$domain.* vesta/
         fi
 
@@ -260,7 +257,7 @@ then
 
         # Backingup dns recods
         cp $USER_DATA/dns/$domain.conf vesta/$domain.conf
-        cp $HOMEDIR/$user/conf/dns/$domain.db conf/$domain.db
+        cp $VESTA/data/users/$user/conf/dns/$domain.db conf/$domain.db
     done
     if [ "$i" -eq 1 ]; then
         echo -e "$(date "+%F %T") $i domain"
@@ -301,7 +298,7 @@ then
 
         # Creating exim config
         cd $tmpdir/mail/$domain/
-        cp $HOMEDIR/$user/conf/mail/$domain/* conf/
+        cp $VESTA/data/users/$user/conf/mail/$domain/* conf/
 
         # Creating vesta config
         conf="$USER_DATA/mail.conf"
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 22b41d2f3..bf421ff51 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -44,29 +44,12 @@ is_object_valid "dns/$domain" 'ID' "$id"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Parsing domain config
+# Deleting old record
 line=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
 eval $line
-
-# Null priority for none MX/SRV records
 if [ "$TYPE" != 'MX' ] && [ "$TYPE" != 'SRV' ]; then
     priority=''
 fi
-
-# Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-fqdn_type=$(echo $TYPE | grep "[NS|CNAME|MX|PTR|SRV]")
-if [ ! -z "$fqdn_type" ]; then
-    trailing_dot=$(echo $dvalue | grep "\.$")
-    if [ -z $trailing_dot ]; then
-        dvalue="$dvalue."
-    fi
-fi
-
-# Additional verifications
-is_dns_fqnd "$TYPE" "$dvalue"
-is_dns_nameserver_valid "$domain" "$TYPE" "$dvalue"
-
-# Deleting old record
 sed -i "/^ID='$id'/d" $USER_DATA/dns/$domain.conf
 
 # Adding record
diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password
index 8b7b6c6b6..82fe1eafc 100755
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@@ -53,9 +53,9 @@ else
     md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
 fi
 
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota
index c8b736d9b..1326c7b21 100755
--- a/bin/v-change-mail-account-quota
+++ b/bin/v-change-mail-account-quota
@@ -43,9 +43,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall
index 449e616f4..623536d5e 100755
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@@ -40,8 +40,8 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Change cathcall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "*@$domain:$email" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip
index 429784e60..ffab52967 100755
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@@ -46,7 +46,7 @@ is_ip_avalable
 get_domain_values 'web'
 ip=$(get_real_ip $ip)
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 old=$(get_real_ip $IP)
 new=$ip
 replace_web_config
@@ -54,21 +54,21 @@ replace_web_config
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     replace_web_config
 fi
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
 # Checking SSL proxy
 if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then 
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index a92c87bf9..cca85086b 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -50,7 +50,7 @@ is_proxy_template_valid
 get_domain_values 'web'
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
 old_tpl=$PROXY
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Delete old vhost
@@ -68,7 +68,7 @@ chmod 640 $conf
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$old_tpl.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
 
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$template.stpl"
diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert
index 42b567931..6380a4a71 100755
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@@ -43,7 +43,7 @@ is_web_domain_cert_valid
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 
@@ -57,11 +57,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
 fi
 
 # Adding new certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $VESTA/data/users/$user/conf/web/ssl.$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $VESTA/data/users/$user/conf/web/ssl.$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $VESTA/data/users/$user/conf/web/ssl.$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $VESTA/data/users/$user/conf/web/ssl.$domain.ca
 fi
 
 
diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome
index 091ad3be1..7eb81774e 100755
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@@ -40,7 +40,7 @@ get_domain_values 'web'
 old_ssl_home=$SSL_HOME
 SSL_HOME=$ssl_home
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 
 # Parsing tpl_option
 case $SSL_HOME in
@@ -57,7 +57,7 @@ replace_web_config
 # Checking proxy config
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats
index 11f59e986..2a708550f 100755
--- a/bin/v-change-web-domain-stats
+++ b/bin/v-change-web-domain-stats
@@ -57,7 +57,7 @@ stats_dir="$HOMEDIR/$user/web/$domain/stats"
 rm -rf $stats_dir/*
 
 # Deleting config
-rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
 
 # Preparing domain values for the template substitution
 upd_web_domain_values
@@ -78,11 +78,11 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s/%home%/${HOMEDIR////\/}/g" \
         -e "s/%alias%/${aliases//,/ }/g" \
         -e "s/%alias_idn%/${aliases_idn//,/ }/g" \
-    > $HOMEDIR/$user/conf/web/$type.$domain.conf
+    > $VESTA/data/users/$user/conf/web/$type.$domain.conf
 
 if [ "$type" == 'awstats' ]; then
     rm -f /etc/awstats/$type.$domain_idn.conf
-    ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
+    ln -s $VESTA/data/users/$user/conf/web/$type.$domain.conf \
         /etc/awstats/$type.$domain_idn.conf
 else
     mkdir -p /var/lib/webalizer
diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl
index 66ada8028..1b3417609 100755
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@@ -49,13 +49,13 @@ ip=$(get_real_ip $IP)
 # Deleting domain
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
 old_tpl=$TPL
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 del_web_config
 
 # Deleting ssl vhost
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
 fi
 
@@ -73,7 +73,7 @@ fi
 
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     tpl_file="$WEBTPL/$WEB_SYSTEM/$template.stpl"
 
     add_web_config
diff --git a/bin/v-check-user-password b/bin/v-check-user-password
new file mode 100755
index 000000000..4902e7dcb
Binary files /dev/null and b/bin/v-check-user-password differ
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index 61907d514..9a05a5920 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -51,7 +51,7 @@ fi
 
 # Deleting domain in named.conf
 sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
-rm -f $HOMEDIR/$user/conf/dns/$domain.db
+rm -f $VESTA/data/users/$user/conf/dns/$domain.db
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index 2e02dc5e6..4708457d3 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -33,7 +33,6 @@ is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 is_object_valid "dns/$domain" 'ID' "$id"
-is_dns_record_critical
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account
index b242ab247..e52281f8a 100755
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@@ -42,11 +42,11 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
 for al in ${aliases//,/ }; do
-    sed -i "/^$al@$domain:$account/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/^$al@$domain:$account/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 done
 
-sed -i "/^$account@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 rm -rf $HOMEDIR/$user/mail/$domain/$account
 
 
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
index dd7e10fa0..0df642440 100755
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@@ -48,7 +48,7 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-sed -i "/^$malias@$domain:$account/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$malias@$domain:$account/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 aliases=$(echo "$aliases" |\
     sed "s/,/\n/g"|\
     sed "s/^$malias$//g"|\
diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply
index fcbe088df..0242375a0 100755
--- a/bin/v-delete-mail-account-autoreply
+++ b/bin/v-delete-mail-account-autoreply
@@ -43,7 +43,7 @@ is_object_value_exist "mail/$domain" 'ACCOUNT' "$account" '$AUTOREPLY'
 #                       Action                             #
 #----------------------------------------------------------#
 
-rm -f $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+rm -f $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 rm -f $USER_DATA/mail/$domain/$account@$domain.msg
 
 
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
index a65aa6ab3..401bf77b0 100755
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@@ -54,8 +54,8 @@ fwd=$(echo "$fwd" |\
     sed "/^$/d"|\
     sed ':a;N;$!ba;s/\n/,/g')
 
-sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$account@$domain:/ d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "$account@$domain:$fwd" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only
index 0fb95ab9a..ebdd045c9 100755
--- a/bin/v-delete-mail-account-fwd-only
+++ b/bin/v-delete-mail-account-fwd-only
@@ -42,7 +42,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 # Deleting account from fwd_only
-sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
+sed -i "/^$account$/d" $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain
index 3729d81f6..54e8b9245 100755
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@@ -43,7 +43,7 @@ get_domain_values 'mail'
 accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ')
 
 rm -f /etc/$MAIL_SYSTEM/domains/$domain_idn
-rm -rf $HOMEDIR/$user/conf/mail/$domain
+rm -rf $VESTA/data/users/$user/conf/mail/$domain
 rm -rf $HOMEDIR/$user/mail/$domain_idn
 
 
diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam
index 41c902be4..31791d001 100755
--- a/bin/v-delete-mail-domain-antispam
+++ b/bin/v-delete-mail-domain-antispam
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
 #----------------------------------------------------------#
 
 # Delete antispam flag
-rm -f $HOMEDIR/$user/conf/mail/$domain/antispam
+rm -f $VESTA/data/users/$user/conf/mail/$domain/antispam
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus
index cfec16ce6..bbb9cf6fa 100755
--- a/bin/v-delete-mail-domain-antivirus
+++ b/bin/v-delete-mail-domain-antivirus
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
 #----------------------------------------------------------#
 
 # Delete antivirus flag
-rm -f $HOMEDIR/$user/conf/mail/$domain/antivirus
+rm -f $VESTA/data/users/$user/conf/mail/$domain/antivirus
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall
index 52b3e9429..1fc22d6e6 100755
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 #----------------------------------------------------------#
 
 # Delete cathcall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim
index c0846ded0..74b75093c 100755
--- a/bin/v-delete-mail-domain-dkim
+++ b/bin/v-delete-mail-domain-dkim
@@ -41,7 +41,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$DKIM'
 # Generating dkim
 rm -f $USER_DATA/mail/$domain.pem
 rm -f $USER_DATA/mail/$domain.pub
-rm -f $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+rm -f $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
 # Checking dns domain
 check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
diff --git a/bin/v-delete-user b/bin/v-delete-user
index d05cc7d9d..ded83d365 100755
--- a/bin/v-delete-user
+++ b/bin/v-delete-user
@@ -91,7 +91,7 @@ sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
 
 # Removing system user
 /usr/sbin/userdel -f $user
-chattr -i $HOMEDIR/$user/conf
+#chattr -i $HOMEDIR/$user/conf
 rm -rf $HOMEDIR/$user
 rm -f /var/spool/mail/$user
 rm -f /var/spool/cron/$user
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index 532ce00ff..ffb0b8bb1 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -45,7 +45,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 # Get template name
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Deleting domain
@@ -61,23 +61,23 @@ fi
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
 
     # Deleting SSL certificates
-    rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+    rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
     rm -f $USER_DATA/ssl/$domain.*
 fi
 
 # Checking proxy
 if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
     fi
 fi
@@ -85,7 +85,7 @@ fi
 # Checking stats
 if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
     sed -i "/ $domain$/d" $VESTA/data/queue/webstats.pipe
-    rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+    rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
     rm -f /etc/awstats/$STATS.$domain.conf
 fi
 
@@ -115,14 +115,14 @@ conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
 ssl_dom=$(grep "SSL='yes'" $USER_DATA/web.conf | wc -l)
 if [ "$ssl_dom" -eq '0' ]; then
     sed -i "/.*\/$user\/.*s$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf
 fi
 
 # Checking last domain
 domains=$(wc -l $USER_DATA/web.conf | cut -f1 -d ' ')
 if [ "$domains" -eq '0' ]; then
     sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf
 fi
 
 # Proxy
@@ -132,14 +132,14 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf)
     if [ -z "$last_sproxy" ]; then
         sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
     fi
 
     # Checking last proxy
     last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf)
     if [ -z "$last_proxy" ]; then
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
index d6862a5f6..97403497a 100755
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@@ -56,7 +56,7 @@ ALIAS=$(echo "$ALIAS" |\
     sed -e "/^$/d"|\
     sed -e ':a;N;$!ba;s/\n/,/g')
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 
 # Preparing domain values for the template substitution
 upd_web_domain_values
@@ -67,7 +67,7 @@ add_web_config
 
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -75,13 +75,13 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
         add_web_config
     fi
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
index 25e6b9d9e..fc145b24b 100755
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@@ -42,13 +42,13 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$PROXY'
 # Defining domain parameters
 get_domain_values 'web'
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 del_web_config
 
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
 fi
 
@@ -67,14 +67,14 @@ conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
 last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf)
 if [ -z "$last_sproxy" ]; then
     sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
 fi
 
 # Checking last proxy
 last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf)
 if [ -z "$last_proxy" ]; then
     sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
 fi
 
 # Restart proxy server
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
index d09dc9ad4..a47e5442e 100755
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@@ -41,7 +41,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
 
 # Parsing domain values
 get_domain_values 'web'
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
 
 # Deleting domain
@@ -49,14 +49,14 @@ del_web_config
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     del_web_config
 fi
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 
@@ -73,7 +73,7 @@ ssl_dom=$(grep "SSL='yes'" $USER_DATA/web.conf)
 conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
 if [ -z "$ssl_dom" ]; then
     sed -i "/.*\/$user\/.*s$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf
 
 fi
 
@@ -82,7 +82,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
     if [ -z "$ssl_dom" ]; then
         sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats
index 3d2292a9f..054c524d2 100755
--- a/bin/v-delete-web-domain-stats
+++ b/bin/v-delete-web-domain-stats
@@ -50,7 +50,7 @@ rm -rf $stats_dir/*
 
 # Deleting config
 rm -f /etc/awstats/$STATS.$domain_idn.conf
-rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services
index aa3b259d2..9b52185a2 100755
--- a/bin/v-list-sys-services
+++ b/bin/v-list-sys-services
@@ -147,22 +147,10 @@ service=$DB_SYSTEM
 if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
     for db in ${DB_SYSTEM//,/ }; do
         service="$db"
-        if [ "$service" == 'mysql' ]; then
-            if [ ! -e "/etc/init.d/$service" ]; then
-                service='mysqld'
-            fi
-            if [ ! -e "/etc/redhat-release" ]; then
-                db_proc_name='mysqld'
-            fi
+        if [ "$service" == 'mysql' ] && [ ! -e "/etc/init.d/$service" ]; then
+            service='mysqld'
         fi
-        if [ "$service" == 'pgsql' ]; then
-            service='postgresql'
-            db_proc_name='postmaster'
-            if [ ! -e "/etc/redhat-release" ]; then
-                db_proc_name='postgres'
-            fi
-        fi
-        get_srv_state $service $db_proc_name
+        get_srv_state $service
         str="$str\nNAME='$service' SYSTEM='database server' STATE='$state'"
         str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
     done
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 663dee410..e4e93ed47 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -46,7 +46,7 @@ nohead=1
 domain_counter=0
 
 # Clean up old config
-rm -f $HOMEDIR/$user/conf/tmp_*.conf
+rm -f $VESTA/data/users/$user/conf/tmp_*.conf
 
 # Starting loop
 for domain in $(shell_list); do
@@ -67,7 +67,7 @@ fi
 # Checking if there is at least 1 domain
 if [ "$domain_counter" -lt 1 ]; then
     # Deleting web configs
-    rm -f $HOMEDIR/$user/conf/web/*
+    rm -f $VESTA/data/users/$user/conf/web/*
     sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf
     if [ -e "$proxy_conf" ]; then
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
@@ -81,8 +81,8 @@ else
     fi
 
     # Renaming tmp config
-    tmp_conf="$HOMEDIR/$user/conf/web/tmp_$WEB_SYSTEM.conf"
-    conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
     mv $tmp_conf $conf
 
     # Checking include
@@ -93,8 +93,8 @@ else
 
     # Checking SSL
     if [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
         mv $tmp_conf $conf
     fi
     ssl_include=$(grep "$conf" $web_conf )
@@ -104,32 +104,32 @@ else
 
     # Checking proxy
     if [ "$proxy_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
         mv $tmp_conf $conf
         proxy_include=$(grep "$conf" $proxy_conf )
         if [ -z "$proxy_include" ]; then
             echo "include $conf;" >> $proxy_conf
         fi
     else
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
     fi
 
     # Checking SSL proxy
     if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         mv $tmp_conf $conf
         proxy_include=$(grep "$conf" $proxy_conf )
         if [ -z "$proxy_include" ]; then
             echo "include $conf;" >> $proxy_conf
         fi
     else
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
 
     fi
 fi
diff --git a/bin/v-restore-user b/bin/v-restore-user
index fe48dba70..87c243764 100755
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -50,8 +50,8 @@ is_backup_valid() {
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-args_usage='USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR] [NOTIFY]'
-check_args '2' "$#" "$args_usage"
+args='USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR] [NOTIFY]'
+check_args '2' "$#" "$args"
 validate_format 'user' 'backup'
 is_backup_valid
 is_backup_available
@@ -302,8 +302,8 @@ if [ "$web" != 'no' ]; then
 
             # Adding vhost
             web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
-            tmp_conf="$HOMEDIR/$user/conf/web/tmp_$WEB_SYSTEM.conf"
-            conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+            tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$WEB_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
             cat $tmp_conf >> $conf
             rm -f $tmp_conf
             web_include=$(grep "$conf" $web_conf)
@@ -313,8 +313,8 @@ if [ "$web" != 'no' ]; then
 
             # Adding SSL vhost
             if [ "$SSL" = 'yes' ]; then
-                tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
-                conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+                tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
+                conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
                 cat $tmp_conf >> $conf
                 rm -f $tmp_conf
             fi
@@ -328,8 +328,8 @@ if [ "$web" != 'no' ]; then
                 # Adding proxy vhost
                 proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
                 if [ ! -z "$PROXY" ]; then
-                    tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
-                    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+                    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
+                    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
                     cat $tmp_conf >> $conf
                     rm -f $tmp_conf
                 fi
@@ -340,8 +340,8 @@ if [ "$web" != 'no' ]; then
 
                 # Adding SSL proxy vhost
                 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
-                    tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
-                    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+                    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
+                    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
                     cat $tmp_conf >> $conf
                     rm -f $tmp_conf
                     proxy_include=$(grep "$conf" $proxy_conf)
diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account
index e5b75c74f..9fefeb097 100755
--- a/bin/v-suspend-mail-account
+++ b/bin/v-suspend-mail-account
@@ -42,9 +42,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 quota=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:SUSPENDED:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index 963929953..49a017136 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -43,7 +43,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 SUSPENDED='yes'
 ip=$(get_real_ip $IP)
 
@@ -57,7 +57,7 @@ add_web_config
 # Check SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -65,7 +65,7 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
@@ -74,7 +74,7 @@ fi
 # Checking proxy SSL
 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SSL/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account
index 776d1f92e..d4f23af09 100755
--- a/bin/v-unsuspend-mail-account
+++ b/bin/v-unsuspend-mail-account
@@ -43,9 +43,9 @@ is_object_suspended "mail/$domain" 'ACCOUNT' "$account"
 
 md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5')
 quota=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain
index d9c004492..fbae76ee7 100755
--- a/bin/v-unsuspend-mail-domain
+++ b/bin/v-unsuspend-mail-domain
@@ -38,7 +38,7 @@ is_object_suspended 'mail' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Add symbolic link
-ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
+ln -s $VESTA/data/users/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain
index 74e4e5f8b..c4582a08f 100755
--- a/bin/v-unsuspend-web-domain
+++ b/bin/v-unsuspend-web-domain
@@ -41,7 +41,7 @@ is_object_suspended 'web' 'DOMAIN' "$domain"
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 SUSPENDED='no'
 ip=$(get_real_ip $IP)
 
@@ -55,7 +55,7 @@ add_web_config
 # Check SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -63,7 +63,7 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -71,7 +71,7 @@ fi
 # Checking SSL proxy
 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index b0309b182..0ebaa4fc1 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -16,7 +16,6 @@ user=${1-admin}
 ip_status=${2-shared}
 
 # Includes
-source /etc/profile.d/vesta.sh
 source $VESTA/func/main.sh
 source $VESTA/conf/vesta.conf
 
@@ -36,7 +35,7 @@ is_object_valid 'user' 'USER' "$user" "$user"
 
 # Get list of ip addresses
 ip_list=$(/sbin/ifconfig | grep 'inet addr:' | cut -f 2 -d : | \
-    cut -f 1 -d ' '| grep -v 127.0.0.1 | grep -v '0.0.0.')
+    cut -f 1 -d ' '| grep -v 127.0.0.1)
 ip_num=$(echo "$ip_list" | wc -l)
 
 # WorkAround for Amazon stop/start issue
diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat
index 0443d187b..50fcbba62 100755
--- a/bin/v-update-web-domain-stat
+++ b/bin/v-update-web-domain-stat
@@ -41,7 +41,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$STATS'
 get_domain_values 'web'
 
 # Checking config
-config="$HOMEDIR/$user/conf/web/$STATS.$domain.conf"
+config="$VESTA/data/users/$user/conf/web/$STATS.$domain.conf"
 if [ ! -e "$config" ]; then
     echo "Error: Parsing error"
     log_event "$E_PARSING" "$EVENT"
diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index 5f0778409..18d33c35a 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -43,14 +43,6 @@ fi
 # Update templates
 tar -xzpf templates.tar.gz -C $VESTA/data/ templates/web
 
-# Replace includes for apache2.4
-if [ "$os" = 'ubuntu' ]; then
-    if [ ! -z "$(apache2 -v|grep 'Apache/2.4')" ]; then
-        sed -i "s/Include /IncludeOptional /g" \
-            $VESTA/data/templates/web/apache2/*tpl
-    fi
-fi
-
 # Rebuild web domains
 for user in $($BIN/v-list-sys-users plain); do
     $BIN/v-rebuild-web-domains $user no
diff --git a/func/domain.sh b/func/domain.sh
index 4215ae678..4ecc5cc41 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -445,10 +445,10 @@ upd_web_domain_values() {
         cgi_option='+ExecCGI'
     fi
 
-    ssl_crt="$HOMEDIR/$user/conf/web/ssl.$domain.crt"
-    ssl_key="$HOMEDIR/$user/conf/web/ssl.$domain.key"
-    ssl_pem="$HOMEDIR/$user/conf/web/ssl.$domain.pem"
-    ssl_ca="$HOMEDIR/$user/conf/web/ssl.$domain.ca"
+    ssl_crt="$USER_DATA/ssl/$domain.crt"
+    ssl_key="$USER_DATA/ssl/$domain.key"
+    ssl_pem="$USER_DATA/ssl/$domain.pem"
+    ssl_ca="$USER_DATA/ssl/$domain.ca"
     if [ ! -e "$USER_DATA/ssl/$domain.ca" ]; then
         ssl_ca_str='#'
     fi
diff --git a/install/debian/templates/web/nginx/caching.stpl b/install/debian/templates/web/nginx/caching.stpl
index 036dc6ee7..4d66a9d9a 100755
--- a/install/debian/templates/web/nginx/caching.stpl
+++ b/install/debian/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/debian/templates/web/nginx/caching.tpl b/install/debian/templates/web/nginx/caching.tpl
index 04e38d445..83e2ca465 100755
--- a/install/debian/templates/web/nginx/caching.tpl
+++ b/install/debian/templates/web/nginx/caching.tpl
@@ -31,11 +31,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/debian/templates/web/nginx/default.stpl b/install/debian/templates/web/nginx/default.stpl
index fa5380606..da8be6751 100755
--- a/install/debian/templates/web/nginx/default.stpl
+++ b/install/debian/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/debian/templates/web/nginx/default.tpl b/install/debian/templates/web/nginx/default.tpl
index 4d5c774bc..f15b96e00 100755
--- a/install/debian/templates/web/nginx/default.tpl
+++ b/install/debian/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/debian/templates/web/nginx/hosting.stpl b/install/debian/templates/web/nginx/hosting.stpl
index d778d6333..c3c88ab52 100755
--- a/install/debian/templates/web/nginx/hosting.stpl
+++ b/install/debian/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/debian/templates/web/nginx/hosting.tpl b/install/debian/templates/web/nginx/hosting.tpl
index 15961c95c..04fddad87 100755
--- a/install/debian/templates/web/nginx/hosting.tpl
+++ b/install/debian/templates/web/nginx/hosting.tpl
@@ -22,14 +22,8 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/templates/web/httpd/suphp.stpl b/install/rhel/templates/web/httpd/suphp.stpl
new file mode 100644
index 000000000..11dabe47d
--- /dev/null
+++ b/install/rhel/templates/web/httpd/suphp.stpl
@@ -0,0 +1,41 @@
+<VirtualHost %ip%:%web_ssl_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %sdocroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile %ssl_crt%
+    SSLCertificateKeyFile %ssl_key%
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+    
+    <IfModule itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+        <IfModule !mod_ruid2.c>
+                SuexecUserGroup %user% %group%
+        </IfModule>
+#        <IfModule mod_ruid2.c>
+#                RMode config
+#                RUidGid %user% %group%
+#                RGroups apache
+#        </IfModule>
+        <Directory %sdocroot%>
+                AllowOverride All
+                SSLRequireSSL
+                Options +Includes -Indexes
+                suPHP_Engine ON
+                suPHP_UserGroup %user% %group%
+        </Directory>
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+
+</VirtualHost>
diff --git a/install/rhel/templates/web/httpd/suphp.tpl b/install/rhel/templates/web/httpd/suphp.tpl
new file mode 100644
index 000000000..ecbedb021
--- /dev/null
+++ b/install/rhel/templates/web/httpd/suphp.tpl
@@ -0,0 +1,35 @@
+  <VirtualHost %ip%:%web_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+        <IfModule !mod_ruid2.c>
+                SuexecUserGroup %user% %group%
+        </IfModule>
+#        <IfModule mod_ruid2.c>
+#                RMode config
+#                RUidGid %user% %group%
+#                RGroups apache
+#        </IfModule>
+        <Directory %docroot%>
+                AllowOverride All
+                Options +Includes -Indexes
+                suPHP_Engine ON
+                suPHP_UserGroup %user% %group%
+        </Directory>
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+
+</VirtualHost>
diff --git a/install/rhel/templates/web/nginx/caching.stpl b/install/rhel/templates/web/nginx/caching.stpl
index 31f6111fa..9465ea1ea 100755
--- a/install/rhel/templates/web/nginx/caching.stpl
+++ b/install/rhel/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/rhel/templates/web/nginx/caching.tpl b/install/rhel/templates/web/nginx/caching.tpl
index 8860be198..f33bab9d9 100755
--- a/install/rhel/templates/web/nginx/caching.tpl
+++ b/install/rhel/templates/web/nginx/caching.tpl
@@ -30,12 +30,6 @@ server {
     location @fallback {
         proxy_pass      http://%ip%:%web_port%;
     }
-
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/rhel/templates/web/nginx/default.stpl b/install/rhel/templates/web/nginx/default.stpl
index 53ad8d1b8..6f1b8659f 100755
--- a/install/rhel/templates/web/nginx/default.stpl
+++ b/install/rhel/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/rhel/templates/web/nginx/default.tpl b/install/rhel/templates/web/nginx/default.tpl
index c1fec114f..23b66557d 100755
--- a/install/rhel/templates/web/nginx/default.tpl
+++ b/install/rhel/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/rhel/templates/web/nginx/hosting.stpl b/install/rhel/templates/web/nginx/hosting.stpl
index aca458a4b..9043ef138 100755
--- a/install/rhel/templates/web/nginx/hosting.stpl
+++ b/install/rhel/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/templates/web/nginx/hosting.tpl b/install/rhel/templates/web/nginx/hosting.tpl
index 44d874962..90f480138 100755
--- a/install/rhel/templates/web/nginx/hosting.tpl
+++ b/install/rhel/templates/web/nginx/hosting.tpl
@@ -22,14 +22,9 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/templates/web/nginx/caching.stpl b/install/ubuntu/templates/web/nginx/caching.stpl
index 036dc6ee7..4d66a9d9a 100755
--- a/install/ubuntu/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/ubuntu/templates/web/nginx/caching.tpl b/install/ubuntu/templates/web/nginx/caching.tpl
index 04e38d445..83e2ca465 100755
--- a/install/ubuntu/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/templates/web/nginx/caching.tpl
@@ -31,11 +31,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
diff --git a/install/ubuntu/templates/web/nginx/default.stpl b/install/ubuntu/templates/web/nginx/default.stpl
index fa5380606..1b91b04e0 100755
--- a/install/ubuntu/templates/web/nginx/default.stpl
+++ b/install/ubuntu/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+       location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/ubuntu/templates/web/nginx/default.tpl b/install/ubuntu/templates/web/nginx/default.tpl
index 4d5c774bc..f15b96e00 100755
--- a/install/ubuntu/templates/web/nginx/default.tpl
+++ b/install/ubuntu/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 
diff --git a/install/ubuntu/templates/web/nginx/hosting.stpl b/install/ubuntu/templates/web/nginx/hosting.stpl
index d778d6333..304e71008 100755
--- a/install/ubuntu/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/templates/web/nginx/hosting.tpl b/install/ubuntu/templates/web/nginx/hosting.tpl
index 15961c95c..8f03503ea 100755
--- a/install/ubuntu/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/templates/web/nginx/hosting.tpl
@@ -22,14 +22,9 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }