diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index a5c50521..c5b355b2 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -98,8 +98,8 @@
     <string id="30112">Include People</string>
     <string id="30113">Include Overview</string>
     <string id="30114">Offer delete after playback</string>
-    <string id="30115"> - For Episodes</string>
-    <string id="30116"> - For Movies</string>
+    <string id="30115">For Episodes</string>
+    <string id="30116">For Movies</string>
     <string id="30117">Background Art Refresh Rate (seconds)</string>
     <string id="30118">Add Resume Percent</string>
     <string id="30119">Add Episode Number</string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 4d6dbba3..cd9473c2 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -97,8 +97,8 @@
     <string id="30112">Lade Darsteller</string>
     <string id="30113">Lade Inhaltsübersicht</string>
     <string id="30114">Löschen von Medien nach dem Abspielen anbieten</string>
-    <string id="30115"> - Für Episoden</string>
-    <string id="30116"> - Für Filme</string>
+    <string id="30115">Für Episoden</string>
+    <string id="30116">Für Filme</string>
     <string id="30117">Aktualisierungsintervall von Hintergrundbildern (Sekunden)</string>
     <string id="30118">Prozentanzeige für Fortsetzen</string>
     <string id="30119">Episodennummer hinzufügen</string>
diff --git a/resources/lib/Player.py b/resources/lib/Player.py
index 8dfa27d3..12d281a2 100644
--- a/resources/lib/Player.py
+++ b/resources/lib/Player.py
@@ -394,16 +394,17 @@ class Player( xbmc.Player ):
                     utils.window('SkipWatched%s' % itemId, "true")
 
                     self.stopPlayback(data)
-                    offerDelete = False
+                    offerDelete = utils.settings('offerDelete') == "true"
+                    offerTypeDelete = False
 
                     if type == "Episode" and utils.settings('offerDeleteTV') == "true":
-                        offerDelete = True
+                        offerTypeDelete = True
 
                     elif type == "Movie" and utils.settings('offerDeleteMovies') == "true":
-                        offerDelete = True
+                        offerTypeDelete = True
 
-                    if percentComplete >= markPlayedAt and offerDelete:
-                        # Item could be stacked, so only offer to delete the main item.
+                    if percentComplete >= markPlayedAt and offerDelete and offerTypeDelete:
+                        # Make the bigger setting be able to disable option easily.
                         self.logMsg("Offering deletion for: %s." % itemId, 1)
                         return_value = xbmcgui.Dialog().yesno("Offer Delete", "Delete %s" % currentFile.split("/")[-1], "on Emby Server?")
                         if return_value:
diff --git a/resources/settings.xml b/resources/settings.xml
index c496e3e4..a0afbfb0 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -37,8 +37,8 @@
 		<setting type="sep" />
 		<setting id="disableCinema" type="bool" label="Disable Emby cinema mode" default="false" visible="true" enable="true" />
         <setting id="offerDelete" type="bool" label="30114" visible="true" enable="true" default="false" />
-		<setting id="offerDeleteTV" type="bool" label="30115" visible="eq(-1,true)" enable="true" default="false" />
-		<setting id="offerDeleteMovies" type="bool" label="30116" visible="eq(-2,true)" enable="true" default="false" />
+		<setting id="offerDeleteTV" type="bool" label="30115" visible="eq(-1,true)" enable="true" default="false" subsetting="true" />
+		<setting id="offerDeleteMovies" type="bool" label="30116" visible="eq(-2,true)" enable="true" default="false" subsetting="true" />
 		<setting id="resumeJumpBack" type="slider" label="On Resume Jump Back Seconds" default="10" range="0,1,120" option="int" visible="true" enable="true" />
 	    <setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" default="false" />
 	    <setting id="videoBitRate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="eq(-1,true)" default="17" />