diff --git a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerSettings.cs b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerSettings.cs
index fd843ebba..af2241697 100644
--- a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerSettings.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerSettings.cs
@@ -31,18 +31,18 @@ namespace NzbDrone.Core.Notifications.Plex.Server
         [FieldDefinition(1, Label = "Port")]
         public int Port { get; set; }
 
-        [FieldDefinition(2, Label = "Auth Token", Type = FieldType.Textbox, Advanced = true)]
+        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Connect to Plex over HTTPS instead of HTTP")]
+        public bool UseSsl { get; set; }
+
+        [FieldDefinition(3, Label = "Auth Token", Type = FieldType.Textbox, Advanced = true)]
         public string AuthToken { get; set; }
 
-        [FieldDefinition(3, Label = "Authenticate with Plex.tv", Type = FieldType.OAuth)]
+        [FieldDefinition(4, Label = "Authenticate with Plex.tv", Type = FieldType.OAuth)]
         public string SignIn { get; set; }
 
-        [FieldDefinition(4, Label = "Update Library", Type = FieldType.Checkbox)]
+        [FieldDefinition(5, Label = "Update Library", Type = FieldType.Checkbox)]
         public bool UpdateLibrary { get; set; }
 
-        [FieldDefinition(5, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Connect to Plex over HTTPS instead of HTTP")]
-        public bool UseSsl { get; set; }
-
         public bool IsValid => !string.IsNullOrWhiteSpace(Host);
 
         public NzbDroneValidationResult Validate()
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
index c3c9eb911..c58d0be4d 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
             UpdateAndClean(message.Artist);
         }
 
-        public override string Name => "Kodi (XBMC)";
+        public override string Name => "Kodi";
 
         public override ValidationResult Test()
         {