diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 6c2eeace..ffd6f422 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -297,7 +297,7 @@
     <string id="30532">Duration of the video library pop up (in seconds)</string>
     <string id="30533">Duration of the music library pop up (in seconds)</string>
     <string id="30534">Server messages</string>
-    <string id="30535">Generate a new device Id</string>
+    <string id="30535">[COLOR yellow]Generate a new unique device Id (e.g. when cloning Kodi)[/COLOR]</string>
     <string id="30536">Users must log in every time when Kodi restarts</string>
     <string id="30537">Restart Kodi if you make changes</string>
     <string id="30538">Complete Re-Sync necessary</string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index a8d107bd..09450416 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -24,6 +24,7 @@
     <string id="30521">Bei Wiederaufnahme zurückspulen (in Sekunden)</string>
     <string id="30505">[COLOR yellow]Anzahl Login-Versuche zurücksetzen[/COLOR]</string>
 
+    <string id="30535">[COLOR yellow]Neue einzigartige Geräte-ID generieren (z.B. wenn Kodi geklont wurde)[/COLOR]</string>
     <string id="30536">Benutzer müssen sich bei jedem Neustart von Kodi neu anmelden</string>
     <string id="30537">Bei Änderungen Kodi neu starten</string>
     <string id="30538">Komplette Neusynchronisierung nötig</string>
diff --git a/resources/lib/clientinfo.py b/resources/lib/clientinfo.py
index 2596abaf..10752714 100644
--- a/resources/lib/clientinfo.py
+++ b/resources/lib/clientinfo.py
@@ -69,7 +69,7 @@ class ClientInfo():
         If id does not exist, create one and save in Kodi settings file.
         """
 
-        if reset:
+        if reset is True:
             utils.window('plex_client_Id', clear=True)
             utils.settings('plex_client_Id', value="")
 
@@ -78,7 +78,8 @@ class ClientInfo():
             return clientId
 
         clientId = utils.settings('plex_client_Id')
-        if clientId:
+        # Because Kodi appears to cache file settings!!
+        if clientId != "" and reset is False:
             utils.window('plex_client_Id', value=clientId)
             self.logMsg("Unique device Id plex_client_Id loaded: %s" % clientId, 1)
             return clientId
diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py
index 946b3345..ed8cfd31 100644
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@@ -288,9 +288,8 @@ def resetDeviceId():
     dialog = xbmcgui.Dialog()
     language = utils.language
 
-    deviceId_old = utils.window('emby_deviceId')
+    deviceId_old = utils.window('plex_client_Id')
     try:
-        utils.window('emby_deviceId', clear=True)
         deviceId = clientinfo.ClientInfo().getDeviceId(reset=True)
     except Exception as e:
         utils.logMsg(addonName,
diff --git a/resources/settings.xml b/resources/settings.xml
index edb9f19a..8703a687 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -122,6 +122,7 @@
 		<setting id="connectMsg" type="bool" label="30249" default="true" />
 		<setting label="39018" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=repair)" option="close" /> <!-- Repair local database (force update all content) -->
 		<setting label="39020" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=texturecache)" option="close" /> <!-- Cache all images to Kodi texture cache -->
+		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=deviceid)" /><!-- Reset device id uuid -->
 		<setting label="39021" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=thememedia)" option="close" visible="false" /> <!-- Sync Plex Theme Media to Kodi -->
 		<setting type="lsep" label="39049" /><!-- Nothing works? Try a full reset -->
 		<setting label="39019" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=reset)" option="close" /> <!-- Partial or full reset of Database and PKC -->