diff --git a/resources/lib/connect/credentials.py b/resources/lib/connect/credentials.py
index 9cc779b6..4712a7c2 100644
--- a/resources/lib/connect/credentials.py
+++ b/resources/lib/connect/credentials.py
@@ -17,12 +17,13 @@ log = logging.getLogger("EMBY."+__name__.split('.')[-1])
 
 class Credentials(object):
 
+    _shared_state = {} # Borg
     credentials = None
     path = ""
     
 
     def __init__(self):
-        pass
+        self.__dict__ = self._shared_state
 
     def setPath(self, path):
         # Path to save persistant data.txt
diff --git a/resources/lib/connectmanager.py b/resources/lib/connectmanager.py
index 9c8cdf27..99a4eae0 100644
--- a/resources/lib/connectmanager.py
+++ b/resources/lib/connectmanager.py
@@ -210,8 +210,7 @@ class ConnectManager(object):
             for cred_server in credentials['Servers']:
                 if server['Id'] == cred_server['Id']:
                     # Update token saved in current state
-                    server.update(server)
-                    log.info(self.get_state())
+                    server.update(cred_server)
         # Update the token in data.txt
         self._connect.credentialProvider.getCredentials(credentials)