diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index ae50f1882530bd4da96489c2ab2411b559f44378..846e83b19a905656d20d7f1ea04d8ff3d980c72b 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -105,6 +105,24 @@
             } else {
             %><input type="hidden" name="type" value="<%=wizardBean.getType()%>" /><%
             } %>
+
+            <% if (curPage == 3) {
+            %><div id="nameField" class="rowItem">
+                <label for="name" accesskey="N">
+                    <%=intl._("Name")%>:(<span class="accessKey">N</span>)
+                </label>
+                <input type="text" size="30" maxlength="50" name="name" id="name" title="Tunnel Name" value="" class="freetext" />
+            </div>
+            <div id="descriptionField" class="rowItem">
+                <label for="description" accesskey="e">
+                    <%=intl._("Description")%>:(<span class="accessKey">E</span>)
+                </label>
+                <input type="text" size="60" maxlength="80" name="description"  id="description" title="Tunnel Description" value="" class="freetext" />
+            </div><%
+            } else {
+            %><input type="hidden" name="name" value="<%=wizardBean.getName()%>" />
+            <input type="hidden" name="description" value="<%=wizardBean.getDescription()%>" /><%
+            } %>
         </div>
 
         <div id="globalOperationsPanel" class="panel">