diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py
index ce280a3d..649c50db 100644
--- a/web/pgadmin/tools/user_management/__init__.py
+++ b/web/pgadmin/tools/user_management/__init__.py
@@ -28,7 +28,7 @@ from pgadmin.utils.constants import MIMETYPE_APP_JS, INTERNAL,\
     SUPPORTED_AUTH_SOURCES, KERBEROS
 from pgadmin.utils.validation_utils import validate_email
 from pgadmin.model import db, Role, User, UserPreference, Server, \
-    ServerGroup, Process, Setting
+    ServerGroup, Process, Setting, SharedServer
 
 # set template path for sql scripts
 MODULE_NAME = 'user_management'
@@ -347,6 +347,8 @@ def delete(uid):
 
         Process.query.filter_by(user_id=uid).delete()
 
+        SharedServer.query.filter_by(user_id=uid).delete()
+
         # Finally delete user
         db.session.delete(usr)