diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
index b2c430432..7e4c7c5f7 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import net.i2p.data.DataHelper;
 import net.i2p.router.Router;
 import net.i2p.router.transport.FIFOBandwidthRefiller;
 import net.i2p.router.transport.TransportManager;
@@ -164,6 +165,9 @@ public class ConfigNetHandler extends FormHandler {
             String oldUdp = _context.getProperty(UDPTransport.PROP_SOURCES,
                                                  _context.router().isHidden() ? "hidden" : UDPTransport.DEFAULT_SOURCES);
             String oldUHost = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, "");
+            // force change to fixed if user enters a host name/IP
+            if (_udpHost1 != null && _udpHost1.length() > 0)
+                _udpAutoIP = "fixed";
             if (_udpAutoIP != null) {
                 String uhost = "";
                 if (_udpAutoIP.equals("fixed")) {
@@ -173,18 +177,17 @@ public class ConfigNetHandler extends FormHandler {
                     for (Object o : _settings.keySet()) {
                         String k = (String) o;
                         if (k.startsWith("addr_")) {
-                            String v = k.substring(5);
+                            String v = DataHelper.stripHTML(k.substring(5));
                             if (v.length() > 0)
                                 addrs.add(v);
                         }
                     }
-                    if (getJettyString("addrnew") != null) {
-                        if (_udpHost1 != null && _udpHost1.length() > 0) {
-                            if (verifyAddress(_udpHost1)) {
-                                addrs.add(_udpHost1);
-                            } else {
-                                error = true;
-                            }
+                    if (_udpHost1 != null && _udpHost1.length() > 0) {
+                        if (verifyAddress(_udpHost1)) {
+                            addrs.add(_udpHost1);
+                        } else {
+                            // verifyAddress() outputs form error
+                            error = true;
                         }
                     }
                     int tot = addrs.size();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index 3eb542f5a..76b136988 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -222,10 +222,12 @@ public class ConfigNetHelper extends HelperBase {
             buf.append(addr);
             buf.append("<br>");
         }
-        buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                   "<input type=\"checkbox\" class=\"optbox\" name=\"addrnew\"");
-        buf.append(CHECKED);
-        buf.append("><input name =\"udpHost1\" type=\"text\" size=\"16\" />" +
+        buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+        if (!addrs.isEmpty()) {
+            buf.append(_t("Add host name or IP"))
+               .append(": ");
+        }
+        buf.append("<input name=\"udpHost1\" type=\"text\" size=\"16\" >" +
                    "</div>");
         return buf.toString();
     }