diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
index 47fc2737b..cdd38a64b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
@@ -269,6 +269,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
           deftblacl: [],
           deffuncacl: [],
           defseqacl: [],
+          is_template: false,
           deftypeacl: []
         },
 
@@ -321,7 +322,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
           editable: false, type: 'text', group: 'Definition',
           disabled: function(m) { return !m.isNew(); },
           control: 'node-list-by-name', url: 'get_databases', cache_level: 'server',
-          select2: { allowClear: false },
+          select2: { allowClear: false }, mode: ['create'],
           transform: function(data, cell) {
             var res = [],
                 control = cell || this,
@@ -362,6 +363,15 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         },{
           id: 'datconnlimit', label: '{{ _('Connection limit') }}',
           editable: false, type: 'int', group: 'Definition', min: -1
+        },{
+          id: 'is_template', label: '{{ _('Template?') }}',
+          editable: false, type: 'switch', group: 'Definition',
+          disabled: true,  mode: ['properties', 'edit'],
+          options: {
+            'onText': 'Yes', 'offText': 'No',
+            'onColor': 'success', 'offColor': 'primary',
+            'size': 'small'
+          }
         },{
           id: 'datallowconn', label: '{{ _('Allow connections?') }}',
           editable: false, type: 'switch', group: 'Definition',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql
index 65711cefe..2f6e42319 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql
@@ -1,10 +1,10 @@
 SELECT
-    db.oid as did, db.datname as name, db.dattablespace AS spcoid,
+    db.oid AS did, db.datname AS name, db.dattablespace AS spcoid,
     spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding,
     pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit,
-    has_database_privilege(db.oid, 'CREATE') as cancreate,
+    has_database_privilege(db.oid, 'CREATE') AS cancreate,
     current_setting('default_tablespace') AS default_tablespace,
-    descr.description as comments,
+    descr.description AS comments, db.datistemplate AS is_template,
     {### Default ACL for Tables ###}
     (SELECT array_to_string(ARRAY(
         SELECT array_to_string(defaclacl::text[], ', ')
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql
index d51982304..cb1a454ea 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql
@@ -1,10 +1,10 @@
 SELECT
-    db.oid as did, db.datname as name, db.dattablespace AS spcoid,
+    db.oid AS did, db.datname AS name, db.dattablespace AS spcoid,
     spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding,
     pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit,
-    has_database_privilege(db.oid, 'CREATE') as cancreate,
+    has_database_privilege(db.oid, 'CREATE') AS cancreate,
     current_setting('default_tablespace') AS default_tablespace,
-    descr.description as comments,
+    descr.description AS comments, db.datistemplate AS is_template,
     {### Default ACL for Tables ###}
     (SELECT array_to_string(ARRAY(
         SELECT array_to_string(defaclacl::text[], ', ')
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql
index d51982304..cb1a454ea 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql
@@ -1,10 +1,10 @@
 SELECT
-    db.oid as did, db.datname as name, db.dattablespace AS spcoid,
+    db.oid AS did, db.datname AS name, db.dattablespace AS spcoid,
     spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding,
     pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit,
-    has_database_privilege(db.oid, 'CREATE') as cancreate,
+    has_database_privilege(db.oid, 'CREATE') AS cancreate,
     current_setting('default_tablespace') AS default_tablespace,
-    descr.description as comments,
+    descr.description AS comments, db.datistemplate AS is_template,
     {### Default ACL for Tables ###}
     (SELECT array_to_string(ARRAY(
         SELECT array_to_string(defaclacl::text[], ', ')