diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index dbcd6bd86..eb407ec16 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -149,7 +149,9 @@
                     <span class="accessKey">L</span>ocal destination:
                 </label>
                 <textarea rows="1" cols="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" wrap="off"><%=editBean.getDestinationBase64(curTunnel)%></textarea>               
-                <span class="comment">(if known)</span>
+         <% if (!"".equals(editBean.getDestinationBase64(curTunnel))) { %>    
+            <a href="/susidns/addressbook.jsp?book=private&hostname=<%=editBean.getTunnelName(curTunnel)%>&destination=<%=editBean.getDestinationBase64(curTunnel)%>#add">Add to local addressbook</a>    
+         <% } %>
             </div>
             
             <div class="footer">
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 05a012936..d36b91354 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -160,7 +160,8 @@
 <div id="add">
 <p class="add">
 <h3>Add new destination:</h3>
-Hostname: <input type="text" name="hostname" value="" size="20"> Destination: <textarea name="destination" rows="1" cols="20" wrap="off" ></textarea><br/>
+Hostname: <input type="text" name="hostname" value="${book.hostname}" size="20">
+Destination: <textarea name="destination" rows="1" cols="20" wrap="off" >${book.destination}</textarea><br/>
 <input type="image" name="action" value="add" src="images/add.png" alt="Add destination" />
 </p>
 </div>