diff --git a/addon.xml b/addon.xml
index a69ea8d..3d217f0 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.movistarplus"
        name="Movistar+"
-       version="0.3.11"
+       version="0.3.12"
        provider-name="Paco8">
   <requires>
   <!--- <import addon="xbmc.python" version="2.25.0"/> -->
diff --git a/resources/lib/movistar.py b/resources/lib/movistar.py
index 1d19b81..a8455ed 100644
--- a/resources/lib/movistar.py
+++ b/resources/lib/movistar.py
@@ -80,6 +80,8 @@ class Movistar(object):
 
       # Device ID
       self.account['device_id'] = self.cache.load_file('device_id.conf')
+      if self.account['device_id']:
+        self.account['device_id'] = self.account['device_id'].strip('"')
       if not reuse_devices:
         LOG('not reusing devices')
         if not self.account['device_id']:
@@ -326,6 +328,7 @@ class Movistar(object):
       return self.delete_device(self.account['device_id'])
 
     def new_device_id(self):
+      """
       headers = self.net.headers.copy()
       headers['Content-Type'] = 'application/json'
       headers['x-movistarplus-ui'] = '2.36.30'
@@ -334,7 +337,12 @@ class Movistar(object):
       url = 'https://auth.dof6.com/movistarplus/webplayer/accounts/'+ self.account['id'] + '/devices/?qspVersion=ssp'
       response = self.net.session.post(url, headers=headers)
       content = response.content.decode('utf-8')
-      return content.replace('"', '')
+      return content.strip('"')
+      """
+      import random
+      s = ''
+      for _ in range(0, 32): s += random.choice('abcdef0123456789')
+      return s
 
     def delete_device(self, device_id):
       headers = self.net.headers.copy()
diff --git a/resources/lib/proxy.py b/resources/lib/proxy.py
index dc6131b..402b570 100644
--- a/resources/lib/proxy.py
+++ b/resources/lib/proxy.py
@@ -161,7 +161,7 @@ class RequestHandler(BaseHTTPRequestHandler):
             global previous_token, reregister_needed
             while True:
               LOG('reregister_needed: {}'.format(reregister_needed))
-              if reregister_needed:
+              if reregister_needed and xbmcaddon.Addon().getSettingBool('reregister'):
                 mvs().unregister_device()
                 mvs().register_device()