diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html
index 4a1ec1c445..aa518609da 100644
--- a/dashboard-ui/advancedserversettings.html
+++ b/dashboard-ui/advancedserversettings.html
@@ -25,6 +25,11 @@
                             <label for="txtWebSocketPortNumber">Web socket port number: </label>
                             <input type="number" id="txtWebSocketPortNumber" name="txtWebSocketPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" />
                         </li>
+                        <li>
+                            <label for="chkEnableUpnp">Enable UPnP</label>
+                            <input type="checkbox" id="chkEnableUpnp" data-mini="true" />
+                            <div class="fieldDescription">UPnP allows automated router configuration for remote access.</div>
+                        </li>
                     </ul>
                     <ul data-role="listview" class="ulForm">
                         <li>
diff --git a/dashboard-ui/scripts/advancedserversettings.js b/dashboard-ui/scripts/advancedserversettings.js
index 66bf30d5af..e45b0a7d3f 100644
--- a/dashboard-ui/scripts/advancedserversettings.js
+++ b/dashboard-ui/scripts/advancedserversettings.js
@@ -13,6 +13,8 @@
 
         $('#txtPortNumber', page).val(config.HttpServerPortNumber);
 
+        $('#chkEnableUpnp', page).checked(config.EnableUPnP).checkboxradio('refresh');
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -45,6 +47,7 @@
 
                 config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val();
                 config.HttpServerPortNumber = $('#txtPortNumber', form).val();
+                config.EnableUPnP = $('#chkEnableUpnp', form).checked();
 
                 ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
             });