diff --git a/src/networking.html b/src/networking.html
index b885e9b892..991bcc2918 100644
--- a/src/networking.html
+++ b/src/networking.html
@@ -8,26 +8,13 @@
                         <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/networking/index.html">${Help}</a>
                     </div>
 
-                    <div class="inputContainer">
-                        <input is="emby-input" type="text" id="txtLanNetworks" label="${LabelLanNetworks}" />
-                        <div class="fieldDescription">${LanNetworksHelp}</div>
-                    </div>
-                    <div class="inputContainer">
-                        <input is="emby-input" type="text" id="txtLocalAddress" label="${LabelBindToLocalNetworkAddress}" />
-                        <div class="fieldDescription">${LabelBindToLocalNetworkAddressHelp}</div>
-                    </div>
-                    <div class="inputContainer">
-                        <input is="emby-input" type="number" id="txtPortNumber" label="${LabelLocalHttpServerPortNumber}" pattern="[0-9]*" required="required" min="1" max="65535" />
-                        <div class="fieldDescription">${LabelLocalHttpServerPortNumberHelp}</div>
-                    </div>
-
-                    <div class="inputContainer fldBaseUrl">
-                        <input is="emby-input" id="txtBaseUrl" type="text" label="${LabelBaseUrl}" />
-                        <div class="fieldDescription">${LabelBaseUrlHelp}</div>
-                    </div>
-
                     <fieldset class='verticalSection verticalSection-extrabottompadding'>
-                        <legend><h3>${HeaderHttpsSettings}</h3></legend>
+                        <legend><h3>${HeaderServerAddressSettings}</h3></legend>
+
+                        <div class="inputContainer">
+                            <input is="emby-input" type="number" id="txtPortNumber" label="${LabelLocalHttpServerPortNumber}" pattern="[0-9]*" required="required" min="1" max="65535" />
+                            <div class="fieldDescription">${LabelLocalHttpServerPortNumberHelp}</div>
+                        </div>
 
                         <div class="checkboxContainer checkboxContainer-withDescription">
                             <label>
@@ -37,6 +24,30 @@
                             <div class="fieldDescription checkboxFieldDescription">${LabelEnableHttpsHelp}</div>
                         </div>
 
+                        <div class="inputContainer">
+                            <input is="emby-input" type="number" id="txtHttpsPort" pattern="[0-9]*" required="required" min="1" max="65535" label="${LabelHttpsPort}" />
+                            <div class="fieldDescription">${LabelHttpsPortHelp}</div>
+                        </div>
+
+                        <div class="inputContainer fldBaseUrl">
+                            <input is="emby-input" id="txtBaseUrl" type="text" label="${LabelBaseUrl}" />
+                            <div class="fieldDescription">${LabelBaseUrlHelp}</div>
+                        </div>
+
+                        <div class="inputContainer">
+                            <input is="emby-input" type="text" id="txtLocalAddress" label="${LabelBindToLocalNetworkAddress}" />
+                            <div class="fieldDescription">${LabelBindToLocalNetworkAddressHelp}</div>
+                        </div>
+
+                        <div class="inputContainer">
+                            <input is="emby-input" type="text" id="txtLanNetworks" label="${LabelLanNetworks}" />
+                            <div class="fieldDescription">${LanNetworksHelp}</div>
+                        </div>
+                    </fieldset>
+
+                    <fieldset class='verticalSection verticalSection-extrabottompadding'>
+                        <legend><h3>${HeaderHttpsSettings}</h3></legend>
+
                         <div class="checkboxContainer checkboxContainer-withDescription">
                             <label>
                                 <input type="checkbox" is="emby-checkbox" id="chkRequireHttps" />
@@ -45,11 +56,6 @@
                             <div class="fieldDescription checkboxFieldDescription">${LabelRequireHttpsHelp}</div>
                         </div>
 
-                        <div class="inputContainer">
-                            <input is="emby-input" type="number" id="txtHttpsPort" pattern="[0-9]*" required="required" min="1" max="65535" label="${LabelHttpsPort}" />
-                            <div class="fieldDescription">${LabelHttpsPortHelp}</div>
-                        </div>
-
                         <div class="inputContainer fldCertificatePath">
                             <div style="display: flex; align-items: center;">
                                 <div style="flex-grow:1;">
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index da2900f43b..a7191557a2 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -473,6 +473,7 @@
     "HeaderSeries": "Series",
     "HeaderSeriesOptions": "Series Options",
     "HeaderSeriesStatus": "Series Status",
+    "HeaderServerAddressSettings": "Server Address Settings",
     "HeaderServerSettings": "Server Settings",
     "HeaderSettings": "Settings",
     "HeaderSetupLibrary": "Setup your media libraries",
@@ -627,7 +628,7 @@
     "LabelEmbedAlbumArtDidl": "Embed album art in Didl",
     "LabelEmbedAlbumArtDidlHelp": "Some devices prefer this method for obtaining album art. Others may fail to play with this option enabled.",
     "LabelEnableAutomaticPortMap": "Enable automatic port mapping",
-    "LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public ports to local ports via UPnP. This may not work with some router models. Changes will not apply until after a server restart.",
+    "LabelEnableAutomaticPortMapHelp": "Automatically forward public ports on your router to local ports on your server via UPnP. This may not work with some router models or network configurations. Changes will not apply until after a server restart.",
     "LabelEnableBlastAliveMessages": "Blast alive messages",
     "LabelEnableBlastAliveMessagesHelp": "Enable this if the server is not detected reliably by other UPnP devices on your network.",
     "LabelEnableDlnaClientDiscoveryInterval": "Client discovery interval (seconds)",
@@ -650,7 +651,7 @@
     "LabelEvent": "Event:",
     "LabelEveryXMinutes": "Every:",
     "LabelBaseUrl": "Base URL:",
-    "LabelBaseUrlHelp": "You can add a custom subdirectory here to access the server from a more unique URL.",
+    "LabelBaseUrlHelp": "Adds a custom subdirectory to the server URL. For example: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "Generate chapter images when videos are imported during the library scan. Otherwise, they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelFailed": "Failed",