diff --git a/MPF.Frontend/EnumExtensions.cs b/MPF.Frontend/EnumExtensions.cs
index b03e96a1..1aa2996b 100644
--- a/MPF.Frontend/EnumExtensions.cs
+++ b/MPF.Frontend/EnumExtensions.cs
@@ -282,8 +282,7 @@ namespace MPF.Frontend
         {
             return (internalLanguage?.ToLowerInvariant()) switch
             {
-                "auto"
-                    or "auto detect" => InterfaceLanguage.AutoDetect,
+                "auto" or "autodetect" or "auto detect" => InterfaceLanguage.AutoDetect,
                 "eng" or "english" => InterfaceLanguage.English,
                 "kor" or "korean" or "한국어" => InterfaceLanguage.Korean,
 
diff --git a/MPF.Frontend/Options.cs b/MPF.Frontend/Options.cs
index 891b8db1..046d89f1 100644
--- a/MPF.Frontend/Options.cs
+++ b/MPF.Frontend/Options.cs
@@ -149,12 +149,12 @@ namespace MPF.Frontend
         {
             get
             {
-                var valueString = GetStringSetting(Settings, "DefaultUILanguage", InterfaceLanguage.AutoDetect.ToString());
+                var valueString = GetStringSetting(Settings, "DefaultUILanguage", InterfaceLanguage.AutoDetect.ShortName());
                 return valueString.ToInterfaceLanguage();
             }
             set
             {
-                Settings["DefaultUILanguage"] = value.ToString();
+                Settings["DefaultUILanguage"] = value.ShortName();
             }
         }
 
diff --git a/MPF.UI/ElementConverter.cs b/MPF.UI/ElementConverter.cs
index a44fddf9..04cf741a 100644
--- a/MPF.UI/ElementConverter.cs
+++ b/MPF.UI/ElementConverter.cs
@@ -18,6 +18,7 @@ namespace MPF.UI
             return value switch
             {
                 DiscCategory discCategory => new Element<DiscCategory>(discCategory),
+                InterfaceLanguage interfaceLanguage => new Element<InterfaceLanguage>(interfaceLanguage),
                 InternalProgram internalProgram => new Element<InternalProgram>(internalProgram),
                 LogCompression logCompression => new Element<LogCompression>(logCompression),
                 MediaType mediaType => new Element<MediaType>(mediaType),
@@ -41,6 +42,7 @@ namespace MPF.UI
             return element switch
             {
                 Element<DiscCategory> dcElement => dcElement.Value,
+                Element<InterfaceLanguage> ilElement => ilElement.Value,
                 Element<InternalProgram> ipElement => ipElement.Value,
                 Element<LogCompression> lcElement => lcElement.Value,
                 Element<MediaType> mtElement => mtElement.Value,