diff --git a/Ombi.Services/Jobs/PlexUserChecker.cs b/Ombi.Services/Jobs/PlexUserChecker.cs
index 7b8c82e6f..d09bba28c 100644
--- a/Ombi.Services/Jobs/PlexUserChecker.cs
+++ b/Ombi.Services/Jobs/PlexUserChecker.cs
@@ -167,6 +167,9 @@ namespace Ombi.Services.Jobs
                 // Main Plex user
                 var dbMainAcc = dbUsers.FirstOrDefault(x => x.Username.Equals(mainPlexAccount.Username, StringComparison.CurrentCulture));
                 var localMainAcc = localUsers.FirstOrDefault(x => x.UserName.Equals(mainPlexAccount.Username, StringComparison.CurrentCulture));
+                
+                // TODO if admin acc does exist, check if we need to update it
+
 
                 // Create the local admin account if it doesn't already exist
                 if (dbMainAcc == null && localMainAcc == null)
diff --git a/Ombi.UI/Modules/Admin/AdminModule.cs b/Ombi.UI/Modules/Admin/AdminModule.cs
index 15dbd81d3..2b3601924 100644
--- a/Ombi.UI/Modules/Admin/AdminModule.cs
+++ b/Ombi.UI/Modules/Admin/AdminModule.cs
@@ -672,7 +672,7 @@ namespace Ombi.UI.Modules.Admin
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            var currentSettings = await PushbulletService.GetSettingsAsync();
+            var currentSettings = await PushoverService.GetSettingsAsync();
             try
             {
                 NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
diff --git a/Ombi.UI/Views/Admin/PushoverNotifications.cshtml b/Ombi.UI/Views/Admin/PushoverNotifications.cshtml
index b5df6bdc5..efc5ddb1d 100644
--- a/Ombi.UI/Views/Admin/PushoverNotifications.cshtml
+++ b/Ombi.UI/Views/Admin/PushoverNotifications.cshtml
@@ -1,25 +1,14 @@
 @using Ombi.UI.Helpers
+@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<Ombi.Core.SettingModels.PushoverNotificationSettings>
 @Html.Partial("Shared/Partial/_Sidebar")
 
 <div class="col-sm-8 col-sm-push-1">
     <form class="form-horizontal" method="POST" id="mainForm">
         <fieldset>
             <legend>Pushover Notifications</legend>
+            
 
-            <div class="form-group">
-                <div class="checkbox">
-             
-                        @if (Model.Enabled)
-                        {
-                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><label for="Enabled">Enabled</label>
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="Enabled" name="Enabled"><label for="Enabled">Enabled</label>
-                        }
-                   
-                </div>
-            </div>
+            @Html.Checkbox(Model.Enabled, "Enabled", "Enabled")
             
             <div class="form-group">
                 <label for="AccessToken" class="control-label">API Key</label>
diff --git a/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml b/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml
index 95b356746..3107c5866 100644
--- a/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml
+++ b/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml
@@ -52,10 +52,6 @@
                 <li id="customDonate" style="display: none"><a id="customDonateHref" href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color: yellow;"></i> <span id="donationText">@UI.Custom_Donation_Default</span></a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                @if (!Html.IsLoggedIn(Context))
-                {
-                    <li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> @UI.Layout_Admin</a></li>
-                }
                 @if (Html.IsAdmin())
                 {
                     <li><a>@UI.Layout_Welcome @Context.CurrentUser.UserName</a></li>
@@ -91,7 +87,7 @@
                     </li>
 
                 }
-                else if (Html.IsLoggedIn(Context)) // Logged in but not admin
+                else if (Html.IsLoggedIn(Context)) // Logged in but not admin but not a real user
                 {
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> @UI.Layout_Welcome @Context.Request.Session[SessionKeys.UsernameKey] <span class="caret"></span></a>