diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index 5d5a4352b49c4559ad8748d5897a08e067f38bef..5870b739ee2df33e886c0ab0d1817c6eef817d71 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -8,6 +8,7 @@
 <jsp:useBean class="net.i2p.i2ptunnel.web.WizardBean" id="wizardBean" scope="request" />
 <jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
 <% String pageStr = request.getParameter("page");
+   /* Get the number of the page we came from */
    int lastPage = 0;
    if (pageStr != null) {
      try {
@@ -19,6 +20,7 @@
        lastPage = 0;
      }
    }
+   /* Determine what page to display now */
    int curPage = 1;
    if ("Previous page".equals(request.getParameter("action"))) {
      curPage = lastPage - 1;
@@ -28,8 +30,17 @@
    if (curPage > 7 || curPage <= 0) {
      curPage = 1;
    }
+   /* Fetch and format a couple of regularly-used values */
    boolean tunnelIsClient = Boolean.valueOf(request.getParameter("isClient"));
    String tunnelType = request.getParameter("type");
+   /* Special case - don't display page 4 for server tunnels */
+   if (curPage == 4 && !tunnelIsClient) {
+     if ("Previous page".equals(request.getParameter("action"))) {
+       curPage = curPage - 1;
+     } else {
+       curPage = curPage + 1;
+     }
+   }
 %>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>