diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
index b3e647ab92..7a1c01bbdc 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
@@ -18,7 +18,7 @@ public MediaBrowserMetadataSettings()
             MovieMetadata = true;
         }
 
-        [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
+        [FieldDefinition(0, Label = "MetadataSettingsMovieMetadata", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata)]
         public bool MovieMetadata { get; set; }
 
         public bool IsValid => true;
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs
index 3dd5f54f40..2b4e7a88d6 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs
@@ -19,10 +19,10 @@ public RoksboxMetadataSettings()
             MovieImages = true;
         }
 
-        [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
+        [FieldDefinition(0, Label = "MetadataSettingsMovieMetadata", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata)]
         public bool MovieMetadata { get; set; }
 
-        [FieldDefinition(1, Label = "Movie Images", Type = FieldType.Checkbox)]
+        [FieldDefinition(1, Label = "MetadataSettingsMovieImages", Type = FieldType.Checkbox, Section = MetadataSectionType.Image)]
         public bool MovieImages { get; set; }
 
         public bool IsValid => true;
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs
index 9cd64cb2e5..72e5970e8d 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs
@@ -19,10 +19,10 @@ public WdtvMetadataSettings()
             MovieImages = true;
         }
 
-        [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
+        [FieldDefinition(0, Label = "MetadataSettingsMovieMetadata", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata)]
         public bool MovieMetadata { get; set; }
 
-        [FieldDefinition(1, Label = "Movie Images", Type = FieldType.Checkbox)]
+        [FieldDefinition(1, Label = "MetadataSettingsMovieImages", Type = FieldType.Checkbox, Section = MetadataSectionType.Image)]
         public bool MovieImages { get; set; }
 
         public bool IsValid => true;
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
index 51c21aa22c..a0341ba5c2 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
@@ -282,7 +282,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil
 
                     details.Add(new XElement("country"));
 
-                    if (Settings.AddCollectionName && movie.MovieMetadata.Value.CollectionTitle != null)
+                    if (Settings.AddCollectionName && movie.MovieMetadata.Value.CollectionTitle.IsNotNullOrWhiteSpace())
                     {
                         var setElement = new XElement("set");
 
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs
index 589feb7fe0..380d4eb61e 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs
@@ -17,31 +17,31 @@ public class XbmcMetadataSettings : IProviderConfig
         public XbmcMetadataSettings()
         {
             MovieMetadata = true;
-            MovieMetadataURL = false;
-            MovieMetadataLanguage = (int)Language.English;
-            MovieImages = true;
             UseMovieNfo = false;
+            MovieMetadataLanguage = (int)Language.English;
+            MovieMetadataURL = false;
             AddCollectionName = true;
+            MovieImages = true;
         }
 
-        [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
+        [FieldDefinition(0, Label = "MetadataSettingsMovieMetadata", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata, HelpText = "MetadataXmbcSettingsMovieMetadataHelpText")]
         public bool MovieMetadata { get; set; }
 
-        [FieldDefinition(1, Label = "Movie Metadata URL", Type = FieldType.Checkbox, HelpText = "Radarr will write the tmdb/imdb url in the .nfo file", Advanced = true)]
-        public bool MovieMetadataURL { get; set; }
-
-        [FieldDefinition(2, Label = "Metadata Language", Type = FieldType.Select, SelectOptions = typeof(RealLanguageFieldConverter), HelpText = "Radarr will write metadata in the selected language if available")]
-        public int MovieMetadataLanguage { get; set; }
-
-        [FieldDefinition(3, Label = "Movie Images", Type = FieldType.Checkbox)]
-        public bool MovieImages { get; set; }
-
-        [FieldDefinition(4, Label = "Use Movie.nfo", Type = FieldType.Checkbox, HelpText = "Radarr will write metadata to movie.nfo instead of the default <movie-filename>.nfo")]
+        [FieldDefinition(1, Label = "MetadataSettingsMovieMetadataNfo", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata, HelpText = "MetadataXmbcSettingsMovieMetadataNfoHelpText")]
         public bool UseMovieNfo { get; set; }
 
-        [FieldDefinition(5, Label = "Collection Name", Type = FieldType.Checkbox, HelpText = "Radarr will write the collection name to the .nfo file", Advanced = true)]
+        [FieldDefinition(2, Label = "MetadataSettingsMovieMetadataLanguage", Type = FieldType.Select, SelectOptions = typeof(RealLanguageFieldConverter), Section = MetadataSectionType.Metadata, HelpText = "MetadataXmbcSettingsMovieMetadataLanguageHelpText")]
+        public int MovieMetadataLanguage { get; set; }
+
+        [FieldDefinition(3, Label = "MetadataSettingsMovieMetadataUrl", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata, HelpText = "MetadataXmbcSettingsMovieMetadataUrlHelpText", Advanced = true)]
+        public bool MovieMetadataURL { get; set; }
+
+        [FieldDefinition(4, Label = "MetadataSettingsMovieMetadataCollectionName", Type = FieldType.Checkbox, Section = MetadataSectionType.Metadata, HelpText = "MetadataXmbcSettingsMovieMetadataCollectionNameHelpText", Advanced = true)]
         public bool AddCollectionName { get; set; }
 
+        [FieldDefinition(5, Label = "MetadataSettingsMovieImages", Type = FieldType.Checkbox, Section = MetadataSectionType.Image, HelpText = "fanart.jpg, poster.jpg")]
+        public bool MovieImages { get; set; }
+
         public bool IsValid => true;
 
         public NzbDroneValidationResult Validate()
diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataSectionType.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataSectionType.cs
new file mode 100644
index 0000000000..7f2251d85b
--- /dev/null
+++ b/src/NzbDrone.Core/Extras/Metadata/MetadataSectionType.cs
@@ -0,0 +1,8 @@
+namespace NzbDrone.Core.Extras.Metadata
+{
+    public static class MetadataSectionType
+    {
+        public const string Metadata = "metadata";
+        public const string Image = "image";
+    }
+}
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 1efd878241..327929b089 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -912,7 +912,18 @@
   "Metadata": "Metadata",
   "MetadataLoadError": "Unable to load Metadata",
   "MetadataSettings": "Metadata Settings",
+  "MetadataSettingsMovieImages": "Movie Images",
+  "MetadataSettingsMovieMetadata": "Movie Metadata",
+  "MetadataSettingsMovieMetadataCollectionName": "Movie Collection Name",
+  "MetadataSettingsMovieMetadataLanguage": "Movie Metadata Language",
+  "MetadataSettingsMovieMetadataNfo": "Use movie.nfo",
+  "MetadataSettingsMovieMetadataUrl": "Movie Metadata URL",
   "MetadataSettingsMovieSummary": "Create metadata files when movies are imported or refreshed",
+  "MetadataXmbcSettingsMovieMetadataCollectionNameHelpText": "Include collection name in .nfo",
+  "MetadataXmbcSettingsMovieMetadataHelpText": ".nfo with full movie metadata",
+  "MetadataXmbcSettingsMovieMetadataLanguageHelpText": "Include selected language if available in .nfo",
+  "MetadataXmbcSettingsMovieMetadataNfoHelpText": "Write metadata to movie.nfo instead of the default <movie-filename>.nfo",
+  "MetadataXmbcSettingsMovieMetadataUrlHelpText": "Include TMDb and IMDb movie URLs in .nfo",
   "Min": "Min",
   "MinAvailability": "Min Availability",
   "MinimumAge": "Minimum Age",