diff --git a/docs/api/components_ItemGrid_GridItem.bs.html b/docs/api/components_ItemGrid_GridItem.bs.html
index ad1d3b9c4..4e2e3bc24 100644
--- a/docs/api/components_ItemGrid_GridItem.bs.html
+++ b/docs/api/components_ItemGrid_GridItem.bs.html
@@ -118,7 +118,7 @@
             m.itemText.text = itemData.Title
         end if
         ' Adjust to wide posters for "View All Next Up"
-        if m.topParent.overhangTitle = tr("View All Next Up")
+        if m.itemGrid.overhangTitle = tr("View All Next Up")
             m.posterMask.maskUri = ""
 
             m.itemPoster.height = 300
diff --git a/docs/api/components_ItemGrid_LoadVideoContentTask.bs.html b/docs/api/components_ItemGrid_LoadVideoContentTask.bs.html
index b6e603c08..5734487d6 100644
--- a/docs/api/components_ItemGrid_LoadVideoContentTask.bs.html
+++ b/docs/api/components_ItemGrid_LoadVideoContentTask.bs.html
@@ -120,8 +120,9 @@
         video.logoImage = api.items.GetImageURL(logoLookupID, "logo", 0, { "maxHeight": 65, "maxWidth": 300, "quality": "90" })
     end if
 
-    if m.global.session.user.Configuration.EnableNextEpisodeAutoPlay
-        if LCase(m.top.itemType) = "episode"
+    if LCase(m.top.itemType) = "episode"
+        userSession = m.global.session.user
+        if userSession.settings["playback.playnextepisode"] = "enabled" or userSession.settings["playback.playnextepisode"] = "webclient" and userSession.Configuration.EnableNextEpisodeAutoPlay
             addNextEpisodesToQueue(video.showID)
         end if
     end if
diff --git a/docs/api/components_JFVideo.bs.html b/docs/api/components_JFVideo.bs.html
index ba66dfd13..0d4421bdf 100644
--- a/docs/api/components_JFVideo.bs.html
+++ b/docs/api/components_JFVideo.bs.html
@@ -94,12 +94,14 @@
 sub showNextEpisodeButton()
     if m.top.content.contenttype <> 4 then return ' only display when content is type "Episode"
     if m.nextupbuttonseconds = 0 then return ' is the button disabled?
-
-    if m.nextEpisodeButton.opacity = 0 and m.global.session.user.configuration.EnableNextEpisodeAutoPlay
-        m.nextEpisodeButton.visible = true
-        m.showNextEpisodeButtonAnimation.control = "start"
-        m.nextEpisodeButton.setFocus(true)
-    end if
+    if m.nextEpisodeButton.opacity <> 0 then return
+    userSession = m.global.session.user
+    if userSession.settings["playback.playnextepisode"] = "disabled" then return
+    if userSession.settings["playback.playnextepisode"] = "webclient" and not userSession.Configuration.EnableNextEpisodeAutoPlay then return
+
+    m.nextEpisodeButton.visible = true
+    m.showNextEpisodeButtonAnimation.control = "start"
+    m.nextEpisodeButton.setFocus(true)
 end sub
 
 '
diff --git a/docs/api/components_data_HomeData.bs.html b/docs/api/components_data_HomeData.bs.html
index c1908f57a..d9c08f3df 100644
--- a/docs/api/components_data_HomeData.bs.html
+++ b/docs/api/components_data_HomeData.bs.html
@@ -62,6 +62,7 @@
         end if
 
     else if datum.type = "Series"
+        m.top.isWatched = datum.UserData.Played
         imgParams = { "maxHeight": 261 }
         imgParams.Append({ "maxWidth": 464 })
 
diff --git a/docs/api/components_video_VideoPlayerView.bs.html b/docs/api/components_video_VideoPlayerView.bs.html
index 32849f642..452a2ef34 100644
--- a/docs/api/components_video_VideoPlayerView.bs.html
+++ b/docs/api/components_video_VideoPlayerView.bs.html
@@ -519,12 +519,14 @@
     if m.osd.visible then return
     if m.top.content.contenttype <> 4 then return ' only display when content is type "Episode"
     if m.nextupbuttonseconds = 0 then return ' is the button disabled?
-
-    if m.nextEpisodeButton.opacity = 0 and m.global.session.user.configuration.EnableNextEpisodeAutoPlay
-        m.nextEpisodeButton.visible = true
-        m.showNextEpisodeButtonAnimation.control = "start"
-        m.nextEpisodeButton.setFocus(true)
-    end if
+    if m.nextEpisodeButton.opacity <> 0 then return
+    userSession = m.global.session.user
+    if userSession.settings["playback.playnextepisode"] = "disabled" then return
+    if userSession.settings["playback.playnextepisode"] = "webclient" and not userSession.Configuration.EnableNextEpisodeAutoPlay then return
+
+    m.nextEpisodeButton.visible = true
+    m.showNextEpisodeButtonAnimation.control = "start"
+    m.nextEpisodeButton.setFocus(true)
 end sub
 
 '
diff --git a/docs/api/source_VideoPlayer.bs.html b/docs/api/source_VideoPlayer.bs.html
index e8a017491..aefeca7a1 100644
--- a/docs/api/source_VideoPlayer.bs.html
+++ b/docs/api/source_VideoPlayer.bs.html
@@ -437,11 +437,11 @@
 end function
 
 sub autoPlayNextEpisode(videoID as string, showID as string)
-    ' use web client setting
-    if m.global.session.user.configuration.EnableNextEpisodeAutoPlay
+    userSession = m.global.session.user
+    if userSession.settings["playback.playnextepisode"] = "enabled" or userSession.settings["playback.playnextepisode"] = "webclient" and userSession.Configuration.EnableNextEpisodeAutoPlay
         ' query API for next episode ID
         url = Substitute("Shows/{0}/Episodes", showID)
-        urlParams = { "UserId": m.global.session.user.id }
+        urlParams = { "UserId": userSession.id }
         urlParams.Append({ "StartItemId": videoID })
         urlParams.Append({ "Limit": 2 })
         resp = APIRequest(url, urlParams)