diff --git a/src/Ombi.Store/Entities/ApplicationConfiguration.cs b/src/Ombi.Store/Entities/ApplicationConfiguration.cs
index 022b6aff7..d9cd5d460 100644
--- a/src/Ombi.Store/Entities/ApplicationConfiguration.cs
+++ b/src/Ombi.Store/Entities/ApplicationConfiguration.cs
@@ -11,9 +11,10 @@ namespace Ombi.Store.Entities
 
     public enum ConfigurationTypes
     {
-        Url,
-        FanartTv,
-        TheMovieDb,
-        StoragePath
+        Url = 1,
+        // 2 was used for Port before the beta
+        FanartTv = 3,
+        TheMovieDb = 4,
+        StoragePath = 5
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs
index b2b16c839..b41975950 100644
--- a/src/Ombi/Program.cs
+++ b/src/Ombi/Program.cs
@@ -26,12 +26,16 @@ namespace Ombi
                 .WithParsed(o =>
                 {
                     host = o.Host;
-                    WebRoot = o.WebRoot;
+                    WebRoot = Path.Combine(o.WebRoot, "wwwroot");
                     storagePath = o.StoragePath;
                 });
 
             Console.WriteLine(HelpOutput(result));
 
+            if (string.IsNullOrEmpty(WebRoot))
+            {
+                WebRoot = Path.Combine(WebHost.CreateDefaultBuilder().GetSetting("contentRoot"), "wwwroot");
+            }
             UrlArgs = host;
 
             var urlValue = string.Empty;
@@ -97,7 +101,9 @@ namespace Ombi
         [Option('s', "storage", Required = false, HelpText = "Storage path, where we save the logs and database")]
         public string StoragePath { get; set; }
 
-        [Option('w', "webroot", Required = false, HelpText = "(Root Path for Reverse Proxies) If not specified, the default is \"(Content Root)/wwwroot\", if the path exists. If the path doesn\'t exist, then a no-op file provider is used.")]
+        [Option('w', "webroot", Required = false,
+            HelpText = "(Root Path for Reverse Proxies) If not specified, the default is \"(Working Directory)\", if the path exists. If the path doesn\'t exist, then a no-op file provider is used."
+            ,Default = "")]
         public string WebRoot { get; set; }
         
     }