diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
index 1fe97a47b..96713ff08 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
@@ -793,7 +793,7 @@ define('pgadmin.node.foreign_key', [
             if (_.has(m, 'handler') && !_.isUndefined(m.handler)) {
               // If OID is undefined then user is trying to add
               // new constraint which should allowed
-              return !(_.isUndefined(m.get('oid')) || m.get('convalidated'));
+              return !(_.isUndefined(m.get('oid')) || !m.get('convalidated'));
             }
             // We can't update condeferred of existing foreign key.
             return !(m.isNew() || !m.get('convalidated'));
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
index 775f9e22e..2201f0a60 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
@@ -1495,6 +1495,9 @@ class BaseTableView(PGChildNodeView, BasePartitionTable):
                         return internal_server_error(errormsg=res)
 
                     old_data = res['rows'][0]
+                    if 'name' not in c:
+                        c['name'] = old_data['name']
+
                     # Sql to update object
                     sql.append(
                         render_template("/".join([