diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index 3f03d252..228732a6 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -56,7 +56,7 @@ chown $user:mail $HOMEDIR/$user/mail/$domain_idn
 chmod 770 $HOMEDIR/$user/mail/$domain_idn
 
 # Adding symlink
-ln -s $HOMEDIR/$user/conf/mail/$domain /etc/exim/domains/$domain_idn
+ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
 
 # Adding antispam protection
 if [ "$antispam" = 'yes' ]; then
diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain
index e6a39965..9aecc6bd 100755
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@@ -42,7 +42,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 get_domain_values 'mail'
 accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ')
 
-rm -f /etc/exim/domains/$domain_idn
+rm -f /etc/$MAIL_SYSTEM/domains/$domain_idn
 rm -rf $HOMEDIR/$user/conf/mail/$domain
 rm -rf $HOMEDIR/$user/mail/$domain_idn
 
diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain
index 4ffa9360..1291da08 100755
--- a/bin/v-suspend-mail-domain
+++ b/bin/v-suspend-mail-domain
@@ -39,7 +39,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Deleting symbolic link
-rm -f /etc/exim/domains/$domain
+rm -f /etc/$MAIL_SYSTEM/domains/$domain
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain
index a15529b6..9b3f1b9e 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/exim/domains/
+ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
 
 
 #----------------------------------------------------------#
diff --git a/install/vst-install.sh b/install/vst-install.sh
index b3be7882..6ae79446 100644
--- a/install/vst-install.sh
+++ b/install/vst-install.sh
@@ -742,10 +742,6 @@ vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null)
 if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then
     # Set NAT association
     $VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip
-
-    # Assign passive ip address
-    echo "pasv_address=$vst_ip" >> /etc/vsftpd/vsftpd.conf
-    service vsftpd restart
 fi
 if [ -z "$vst_ip" ]; then
     vst_ip=$main_ip