diff --git a/Ombi.UI/Modules/Admin/IntegrationModule.cs b/Ombi.UI/Modules/Admin/IntegrationModule.cs
index 75c1f48c9..9cc718e40 100644
--- a/Ombi.UI/Modules/Admin/IntegrationModule.cs
+++ b/Ombi.UI/Modules/Admin/IntegrationModule.cs
@@ -57,6 +57,7 @@ namespace Ombi.UI.Modules.Admin
            
             WatcherSettings = watcher;
             Analytics = a;
+            CpSettings = cp;
 
             Before += (ctx) => Security.AdminLoginRedirect(Permissions.Administrator, ctx);
 
diff --git a/Ombi.UI/Modules/LayoutModule.cs b/Ombi.UI/Modules/LayoutModule.cs
index 41daba2fc..7c784a715 100644
--- a/Ombi.UI/Modules/LayoutModule.cs
+++ b/Ombi.UI/Modules/LayoutModule.cs
@@ -101,7 +101,8 @@ namespace Ombi.UI.Modules
                         || x.Name.Equals(JobNames.PlexChecker) 
                         || x.Name.Equals(JobNames.SonarrCacher)
                         || x.Name.Equals(JobNames.SrCacher)
-                        || x.Name.Equals(JobNames.PlexCacher));
+                        || x.Name.Equals(JobNames.PlexCacher)
+                        || x.Name.Equals(JobNames.WatcherCacher));
 
 
                 return Response.AsJson(cacherJobs.Any() 
diff --git a/Ombi.UI/Views/UserLogin/Username.cshtml b/Ombi.UI/Views/UserLogin/Username.cshtml
index d90b42607..bb6783120 100644
--- a/Ombi.UI/Views/UserLogin/Username.cshtml
+++ b/Ombi.UI/Views/UserLogin/Username.cshtml
@@ -1,4 +1,5 @@
-@using Ombi.UI.Resources
+@using Ombi.UI.Helpers
+@using Ombi.UI.Resources
 @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<Ombi.Core.SettingModels.AuthenticationSettings>
 
 <div class="home">
@@ -30,7 +31,7 @@
 <script>
     $(function () {
 
-        var base = $('#baseUrl').val();
+        var base = '@Html.GetBaseUrl()';
 
         $('#contentBody').on('click', '#loginBtn', function (e) {
             e.preventDefault();