diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index af09a25acf..a5d19b5cbf 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -199,7 +199,6 @@ namespace MediaBrowser.Model.Configuration
 
         public string UICulture { get; set; }
 
-        [Obsolete]
         public DlnaOptions DlnaOptions { get; set; }
 
         public double DownMixAudioBoost { get; set; }
@@ -213,10 +212,8 @@ namespace MediaBrowser.Model.Configuration
 
         public ChannelOptions ChannelOptions { get; set; }
 
-        [Obsolete]
         public ChapterOptions ChapterOptions { get; set; }
 
-        [Obsolete]
         public bool DefaultMetadataSettingsApplied { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index eeab8ee2e7..5c84b92af5 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -289,7 +289,7 @@ namespace MediaBrowser.ServerApplication
             DeleteDeprecatedModules();
 
             MigrateModularConfigurations();
-            ApplyDefaultXbmcSettings();
+            ApplyDefaultMetadataSettings();
         }
 
         private void MigrateModularConfigurations()
@@ -316,7 +316,7 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        private void ApplyDefaultXbmcSettings()
+        private void ApplyDefaultMetadataSettings()
         {
             if (!ServerConfigurationManager.Configuration.DefaultMetadataSettingsApplied)
             {
diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs
index 2d978781f7..a7015e41ff 100644
--- a/MediaBrowser.XbmcMetadata/EntryPoint.cs
+++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs
@@ -36,22 +36,39 @@ namespace MediaBrowser.XbmcMetadata
 
         void _libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e)
         {
-            if (e.UpdateReason == ItemUpdateType.ImageUpdate && e.Item is Person)
+            // TODO: Need a more accurate check here to see if xbmc metadata saving is enabled.
+            // This is probably good enough, but no guarantee
+            var userId = _config.GetNfoConfiguration().UserId;
+            if (string.IsNullOrWhiteSpace(userId))
             {
-                var person = e.Item.Name;
+                return;
+            }
 
-                var items = _libraryManager.RootFolder
-                    .GetRecursiveChildren(i => !i.IsFolder && i.People.Any(p => string.Equals(p.Name, person, StringComparison.OrdinalIgnoreCase)));
+            if (e.UpdateReason == ItemUpdateType.ImageUpdate)
+            {
+                var person = e.Item as Person;
 
-                foreach (var item in items)
+                if (person != null)
                 {
-                    SaveMetadataForItem(item, ItemUpdateType.MetadataEdit);
+                    var items = _libraryManager.RootFolder.RecursiveChildren;
+                    items = person.GetTaggedItems(items).ToList();
+
+                    foreach (var item in items)
+                    {
+                        SaveMetadataForItem(item, ItemUpdateType.MetadataEdit);
+                    }
                 }
             }
         }
 
         void _userDataManager_UserDataSaved(object sender, UserDataSaveEventArgs e)
         {
+            var userId = _config.GetNfoConfiguration().UserId;
+            if (string.IsNullOrWhiteSpace(userId))
+            {
+                return;
+            }
+
             if (e.SaveReason == UserDataSaveReason.PlaybackFinished || e.SaveReason == UserDataSaveReason.TogglePlayed)
             {
                 var item = e.Item as BaseItem;
@@ -73,12 +90,6 @@ namespace MediaBrowser.XbmcMetadata
 
         private async void SaveMetadataForItem(BaseItem item, ItemUpdateType updateReason)
         {
-            var userId = _config.GetNfoConfiguration().UserId;
-            if (string.IsNullOrWhiteSpace(userId))
-            {
-                return;
-            }
-
             var locationType = item.LocationType;
             if (locationType == LocationType.Remote ||
                 locationType == LocationType.Virtual)
diff --git a/MediaBrowser.XbmcMetadata/Savers/AlbumXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/AlbumXmlSaver.cs
index 121514cdda..0f4d25dde4 100644
--- a/MediaBrowser.XbmcMetadata/Savers/AlbumXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/AlbumXmlSaver.cs
@@ -95,20 +95,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
-            {
-                return item is MusicAlbum;
-            }
-
-            return false;
+            return item is MusicAlbum && updateType >= ItemUpdateType.MetadataDownload;
         }
 
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistXmlSaver.cs
index f47785155b..937d702d34 100644
--- a/MediaBrowser.XbmcMetadata/Savers/ArtistXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistXmlSaver.cs
@@ -85,20 +85,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
-            {
-                return item is MusicArtist;
-            }
-
-            return false;
+            return item is MusicArtist && updateType >= ItemUpdateType.MetadataDownload;
         }
 
         private void AddAlbums(IEnumerable<MusicAlbum> albums, StringBuilder builder)
diff --git a/MediaBrowser.XbmcMetadata/Savers/EpisodeXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/EpisodeXmlSaver.cs
index a03eacdc47..1b5c24aad5 100644
--- a/MediaBrowser.XbmcMetadata/Savers/EpisodeXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeXmlSaver.cs
@@ -130,20 +130,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
-            {
-                return item is Episode;
-            }
-
-            return false;
+            return item is Episode && updateType >= ItemUpdateType.MetadataDownload;
         }
     }
 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieXmlSaver.cs
index 586cefe653..fa2155e30a 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieXmlSaver.cs
@@ -118,23 +118,17 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
-            {
-                var video = item as Video;
+            var video = item as Video;
 
-                // Check parent for null to avoid running this against things like video backdrops
-                if (video != null && !(item is Episode) && !video.IsOwnedItem)
-                {
-                    return true;
-                }
+            // Check parent for null to avoid running this against things like video backdrops
+            if (video != null && !(item is Episode) && !video.IsOwnedItem)
+            {
+                return updateType >= ItemUpdateType.MetadataDownload;
             }
 
             return false;
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeasonXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeasonXmlSaver.cs
index 9de589e557..1b6c7a3401 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeasonXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeasonXmlSaver.cs
@@ -71,20 +71,17 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
+            if (!(item is Season))
             {
-                return item is Season;
+                return false;
             }
 
-            return false;
+            return updateType >= ItemUpdateType.MetadataDownload || (updateType >= ItemUpdateType.MetadataImport && File.Exists(GetSavePath(item)));
         }
     }
 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeriesXmlSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeriesXmlSaver.cs
index 9c99cc33d3..94d46f61d3 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeriesXmlSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeriesXmlSaver.cs
@@ -111,20 +111,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
         {
-            var locationType = item.LocationType;
-            if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+            if (!item.SupportsLocalMetadata)
             {
                 return false;
             }
 
-            // If new metadata has been downloaded or metadata was manually edited, proceed
-            if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload
-                || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit)
-            {
-                return item is Series;
-            }
-
-            return false;
+            return item is Series && updateType >= ItemUpdateType.MetadataDownload;
         }
     }
 }