diff --git a/ccserver/ccserver.py b/ccserver/ccserver.py
index c30620ef0e2b89a39546baa43978f40a5457f45b..9f8da5970f9676d38cba47e321188a01b386953d 100644
--- a/ccserver/ccserver.py
+++ b/ccserver/ccserver.py
@@ -133,6 +133,12 @@ class CCServer(object):
         '''
 
         client = self.search_client_by_connection(connection)
+
+        # Unregister objects from database if it have no account attached:
+        obj = self.objects.get(client.login)
+        if obj is not None and 'a' not in obj:
+            self.objects.unregister(obj['id'])
+
         if client.login in self._connected:
             del self._connected[client.login]
         self.objects.unregister_children(client.login)