diff --git a/files/etc/arednsysupgrade.conf b/files/etc/arednsysupgrade.conf
index a8a58c79..4adbe891 100644
--- a/files/etc/arednsysupgrade.conf
+++ b/files/etc/arednsysupgrade.conf
@@ -17,6 +17,7 @@
 /etc/config.mesh/_setup.ports.nat
 /etc/config.mesh/_setup.services.dmz
 /etc/config.mesh/_setup.services.nat
+/etc/config.mesh/vtun
 /etc/config.router/_setup
 /etc/config.router/_setup.dhcp
 /etc/config.router/_setup.ports
diff --git a/files/www/cgi-bin/tunfunc.pm b/files/www/cgi-bin/tunfunc.pm
index cd894e03..e10dd6d8 100644
--- a/files/www/cgi-bin/tunfunc.pm
+++ b/files/www/cgi-bin/tunfunc.pm
@@ -198,7 +198,7 @@ sub vpn_setup_required()
     }
     print "<tr><td align=center><br><b>";
     print "Tunnel software needs to be installed.<br/>";
-    print "<form method='post' action='/cgi-bin/vpn' enctype='multipart/form-data'>\n";
+    print "<form method='post' action='/cgi-bin/$navpage' enctype='multipart/form-data'>\n";
     print "<input type=submit name=button_install value='Click to install' class='btn_tun_install' />";
     print "</form>";
     print "</b></td></tr>\n";