diff --git a/bin/v-change-user-password b/bin/v-change-user-password
index a420502a1..22a3d78f6 100755
--- a/bin/v-change-user-password
+++ b/bin/v-change-user-password
@@ -37,6 +37,10 @@ is_password_valid
 echo "$user:$password" | /usr/sbin/chpasswd
 md5=$(awk -v user=$user -F : 'user == $1 {print $2}' /etc/shadow)
 
+if [ "$user" = 'admin' ] && [ -e "$VESTA/web/reset.admin" ]; then
+    rm -f $VESTA/web/reset.admin
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index ab7bc1295..ce91ce966 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -114,6 +114,16 @@ for ip in $ip_list; do
     fi
 done
 
+# Checking NAT
+pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
+if [ ! -z "$pub_ip" ] && [ ! -e "$VESTA/data/ips/$pub_ip" ]; then
+    check_nat=$(grep -R "$pub_ip" $VESTA/data/ips/)
+    if [ -z "$check_nat" ]; then
+        ip=$(ls -t $VESTA/data/ips/|head -n1)
+        $BIN/v-change-sys-ip-nat $ip $pub_ip
+    fi
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #