diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index c7aae13a16..7265f6e2ac 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -516,7 +516,7 @@
 
                 promise = ApiClient.getCurrentUser().then(function(user) {
                     
-                    if (!user.Configuration.EnableEpisodeAutoQueue) {
+                    if (!user.Configuration.EnableNextEpisodeAutoPlay) {
                         return null;
                     }
 
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index 8e03364bc2..83111efa24 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -25,7 +25,7 @@
 
             $('#selectAudioLanguage', page).val(user.Configuration.AudioLanguagePreference || "");
             $('#selectSubtitleLanguage', page).val(user.Configuration.SubtitleLanguagePreference || "");
-            page.querySelector('.chkEpisodeAutoPlay').checked = user.Configuration.EnableEpisodeAutoQueue;
+            page.querySelector('.chkEpisodeAutoPlay').checked = user.Configuration.EnableNextEpisodeAutoPlay || false;
         });
 
         $('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").trigger('change');
@@ -94,7 +94,7 @@
 
         user.Configuration.SubtitleMode = $('#selectSubtitlePlaybackMode', page).val();
         user.Configuration.PlayDefaultAudioTrack = page.querySelector('.chkPlayDefaultAudioTrack').checked;
-        user.Configuration.EnableEpisodeAutoQueue = page.querySelector('.chkEpisodeAutoPlay').checked;
+        user.Configuration.EnableNextEpisodeAutoPlay = page.querySelector('.chkEpisodeAutoPlay').checked;
 
         AppSettings.enableCinemaMode(page.querySelector('.chkEnableCinemaMode').checked);