1 files changed, 16 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index fc1319136..151aedd27 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Api;
+using System.Globalization;
+using MediaBrowser.Api;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Constants;
@@ -627,10 +628,23 @@ namespace MediaBrowser.ServerApplication
                 OperatingSystem = Environment.OSVersion.ToString(),
                 CanSelfRestart = CanSelfRestart,
                 CanSelfUpdate = CanSelfUpdate,
-                WanAddress = WanAddressEntryPoint.WanAddress
+                WanAddress = GetWanAddress()
             };
         }
 
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+        private string GetWanAddress()
+        {
+            var ip = WanAddressEntryPoint.WanAddress;
+
+            if (!string.IsNullOrEmpty(ip))
+            {
+                return "http://" + ip + ":" + ServerConfigurationManager.Configuration.HttpServerPortNumber.ToString(_usCulture);
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Gets the mac address.
         /// </summary>