diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 672164eae..3321ac1b9 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -463,9 +463,8 @@ endif; ?>
                         $tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
                         $tab_array[] = array(gettext("Client"), true, "vpn_openvpn_client.php");
                         $tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php");
-                        $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
-                                                $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
-                                                $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
+                        $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
+                        $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
                         display_top_tabs($tab_array);
 ?>
 
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 0d9c3ad13..2d493932a 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -322,9 +322,8 @@ if ($act!="new" && $act!="edit") {
                         $tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
                         $tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php");
                         $tab_array[] = array(gettext("Client Specific Overrides"), true, "vpn_openvpn_csc.php");
-                        $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
-                                                $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
-                                                $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
+                        $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
+                        $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
                         display_top_tabs($tab_array);
                     ?>
 
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 7da4a5186..e532e90be 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -620,7 +620,6 @@ if (isset($savemsg)) {
                   $tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
                   $tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php");
                   $tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php");
-                  $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
                   $tab_array[] = array(gettext("Client Export"), true, "vpn_openvpn_export.php");
                   $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
                   display_top_tabs($tab_array);
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index 962462293..a923218f5 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -299,7 +299,6 @@ if (isset($savemsg)) {
                   $tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
                   $tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php");
                   $tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php");
-                  $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
                   $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
                   $tab_array[] = array(gettext("Shared Key Export"), true, "vpn_openvpn_export_shared.php");
                   display_top_tabs($tab_array);
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 87d36e64b..594c6ac97 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -715,7 +715,6 @@ function tuntap_change() {
                         $tab_array[] = array(gettext("Server"), true, "vpn_openvpn_server.php");
                         $tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php");
                         $tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php");
-                        $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
                         $tab_array[] = array(gettext("Client Export"), false, "vpn_openvpn_export.php");
                                         $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
                         display_top_tabs($tab_array);
@@ -1746,8 +1745,14 @@ else :
                                     $i++;
                                     endforeach;
                                     ?>
-									<tr style="display:none;"><td></td></tr>
+                      <tr><td colspan="5">&nbsp;</td></tr>
 									</tbody>
+                  <tfoot>
+                    <tr><td colspan="5">
+                      <a href="wizard.php?xml=openvpn_wizard.xml" class="btn btn-default btn-xs"><span class="fa fa-magic"></span></a>
+                      &nbsp;<?=gettext("use a wizard to setup a new server");?>
+                    </td></tr>
+                  </tfoot>
 								</table>
 
 						<?php