diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
index 8c6fb5b5..6d54c678 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
@@ -209,7 +209,13 @@ export default class FunctionSchema extends BaseUISchema {
     },{
       id: 'funcowner', label: gettext('Owner'), cell: 'string',
       options: this.fieldOptions.role, type: 'select',
-      disabled: (!(this.type === 'procedure')) ? obj.inCatalog() : obj.isGreaterThan95,
+      disabled: (state) => {
+        if (!(this.type === 'procedure')) {
+          obj.inCatalog(state);
+        } else {
+          obj.isGreaterThan95(state);
+        }
+      },
       noEmpty: true,
     },{
       id: 'pronamespace', label: gettext('Schema'), cell: 'string',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
index b83401c4..cbad29d1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
@@ -121,7 +121,7 @@ define('pgadmin.node.procedure', [
           {
             funcowner: pgBrowser.serverInfo[treeNodeInfo.server._id].user.name,
             pronamespace: treeNodeInfo.schema ? treeNodeInfo.schema._id : null,
-            lanname: 'edbspl',
+            lanname:  treeNodeInfo.server.server_type != 'ppas' ? 'sql' : 'edbspl',
           }
         );
       },