diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/acl.sql
index a88e24fc7..49ae351f1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/acl.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/acl.sql
@@ -1,23 +1,23 @@
 SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor,
-	array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
+    array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
 FROM
-	(SELECT
-		d.grantee, d.grantor, d.is_grantable,
-		CASE d.privilege_type
-		WHEN 'USAGE' THEN 'U'
-		ELSE 'UNKNOWN'
-		END AS privilege_type
-	FROM
-		(SELECT lanacl FROM pg_language lan
-		    LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
-		WHERE lan.oid = {{ lid|qtLiteral }}::OID
-		) acl,
-		(SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable AS is_grantable,
-			(d).privilege_type AS privilege_type
-		FROM (SELECT aclexplode(lanacl) as d FROM pg_language lan1
-			WHERE lan1.oid = {{ lid|qtLiteral }}::OID ) a
-		) d
-	) d
+    (SELECT
+        d.grantee, d.grantor, d.is_grantable,
+        CASE d.privilege_type
+        WHEN 'USAGE' THEN 'U'
+        ELSE 'UNKNOWN'
+        END AS privilege_type
+    FROM
+        (SELECT lanacl FROM pg_language lan
+            LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
+        WHERE lan.oid = {{ lid|qtLiteral }}::OID
+        ) acl,
+        (SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable AS is_grantable,
+            (d).privilege_type AS privilege_type
+        FROM (SELECT aclexplode(lanacl) as d FROM pg_language lan1
+            WHERE lan1.oid = {{ lid|qtLiteral }}::OID ) a
+        ) d
+    ) d
 LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
 LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/properties.sql
index 6f6879d2a..7b7f3f30c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/properties.sql
@@ -1,7 +1,7 @@
 SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc,
-	vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
-	(SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
-	(SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
+    vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
+    (SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
+    (SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
 FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline
 LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator
 LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/sqlpane.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/sqlpane.sql
index de942f562..a7e51a930 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/sqlpane.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/sqlpane.sql
@@ -1,6 +1,7 @@
 -- Language: {{data.name}}
 
 -- DROP LANGUAGE {{ conn|qtIdent(data.name) }}
+
 {# ============= CREATE LANGUAGE Query ============= #}
 CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }}
 {% if data.lanproc %}
@@ -10,8 +11,8 @@ CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIde
   INLINE {{ conn|qtIdent(data.laninl) }}
 {% endif %}
 {% if data.lanval %}
-  VALIDATOR {{ conn|qtIdent(data.lanval) }}
-{% endif %};
+  VALIDATOR {{ conn|qtIdent(data.lanval) }}{% endif %};
+  
 {# ============= ALTER LANGUAGE Query ============= #}
 {% if data.lanowner %}
 ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/update.sql
index 520628415..802ad833d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/update.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.1_plus/update.sql
@@ -3,17 +3,17 @@
 {# ============= Update language name ============= #}
 {% if data.name != o_data.name %}
 ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }}
-  RENAME TO {{ conn|qtIdent(data.name) }};
+    RENAME TO {{ conn|qtIdent(data.name) }};
 {% endif %}
 {# ============= Update language user ============= #}
 {% if data.lanowner and data.lanowner != o_data.lanowner %}
 ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
-  OWNER TO {{ conn|qtIdent(data.lanowner) }};
+    OWNER TO {{ conn|qtIdent(data.lanowner) }};
 {% endif %}
 {# ============= Update language comments ============= #}
 {% if data.description and data.description != o_data.description %}
 COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }}
-  IS '{{ data.description }}';
+    IS '{{ data.description }}';
 {% endif %}
 {% endif %}
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/acl.sql
index 3d75620d2..894b7ecb1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/acl.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/acl.sql
@@ -1,19 +1,19 @@
 SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor,
-	array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
+    array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
 FROM
-	(SELECT
-		d.grantee, d.grantor, d.is_grantable,
-		CASE d.privilege_type
-		WHEN 'USAGE' THEN 'U'
-		ELSE 'UNKNOWN'
-		END AS privilege_type
-	FROM
-		(SELECT lanacl FROM pg_language lan
-		    LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
-		WHERE lan.oid = {{ lid|qtLiteral }}::OID
-		) acl,
-		aclexplode(lanacl) d
-	) d
+    (SELECT
+        d.grantee, d.grantor, d.is_grantable,
+        CASE d.privilege_type
+        WHEN 'USAGE' THEN 'U'
+        ELSE 'UNKNOWN'
+        END AS privilege_type
+    FROM
+        (SELECT lanacl FROM pg_language lan
+            LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
+        WHERE lan.oid = {{ lid|qtLiteral }}::OID
+        ) acl,
+        aclexplode(lanacl) d
+    ) d
 LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
 LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/properties.sql
index 6f6879d2a..7b7f3f30c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/properties.sql
@@ -1,7 +1,7 @@
 SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc,
-	vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
-	(SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
-	(SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
+    vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
+    (SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
+    (SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
 FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline
 LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator
 LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/sqlpane.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/sqlpane.sql
index de942f562..d8a3d36bb 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/sqlpane.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/sqlpane.sql
@@ -1,19 +1,20 @@
 -- Language: {{data.name}}
 
 -- DROP LANGUAGE {{ conn|qtIdent(data.name) }}
+
 {# ============= CREATE LANGUAGE Query ============= #}
 CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }}
 {% if data.lanproc %}
-  HANDLER {{ conn|qtIdent(data.lanproc) }}
+    HANDLER {{ conn|qtIdent(data.lanproc) }}
 {% endif %}
 {% if data.laninl %}
-  INLINE {{ conn|qtIdent(data.laninl) }}
+    INLINE {{ conn|qtIdent(data.laninl) }}
 {% endif %}
 {% if data.lanval %}
-  VALIDATOR {{ conn|qtIdent(data.lanval) }}
-{% endif %};
+    VALIDATOR {{ conn|qtIdent(data.lanval) }}{% endif %};
+    
 {# ============= ALTER LANGUAGE Query ============= #}
 {% if data.lanowner %}
 ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
-  OWNER TO {{ conn|qtIdent(data.lanowner) }};
+    OWNER TO {{ conn|qtIdent(data.lanowner) }};
 {% endif %}
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/update.sql
index 520628415..802ad833d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/update.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/9.3_plus/update.sql
@@ -3,17 +3,17 @@
 {# ============= Update language name ============= #}
 {% if data.name != o_data.name %}
 ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }}
-  RENAME TO {{ conn|qtIdent(data.name) }};
+    RENAME TO {{ conn|qtIdent(data.name) }};
 {% endif %}
 {# ============= Update language user ============= #}
 {% if data.lanowner and data.lanowner != o_data.lanowner %}
 ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
-  OWNER TO {{ conn|qtIdent(data.lanowner) }};
+    OWNER TO {{ conn|qtIdent(data.lanowner) }};
 {% endif %}
 {# ============= Update language comments ============= #}
 {% if data.description and data.description != o_data.description %}
 COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }}
-  IS '{{ data.description }}';
+    IS '{{ data.description }}';
 {% endif %}
 {% endif %}