diff --git a/geonetwork/geonetwork/templates/data-db-default.sql.j2 b/geonetwork/geonetwork/templates/data-db-default.sql.j2
index 7d3f20b6..c8fdac9d 100644
--- a/geonetwork/geonetwork/templates/data-db-default.sql.j2
+++ b/geonetwork/geonetwork/templates/data-db-default.sql.j2
@@ -676,10 +676,10 @@ INSERT INTO HarvesterSettings (id, parentid, name, value) VALUES  (1,NULL,'harve
 -- === Table: Users
 -- ======================================================================
 
-{% if geonetwork_minor_version >= 2 %}
-INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, isenabled) VALUES  (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', 'y');
-{% else %}
+{% if geonetwork_point_version < 2 or geonetwork_minor_version < 2 %}
 INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, enabled) VALUES  (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', true);
+{% else %}
+INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, isenabled) VALUES  (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', 'y');
 {% endif %}
 INSERT INTO Address (id, address, city, country, state, zip) VALUES  (1, '', '', '', '', '');
 INSERT INTO UserAddress (userid, addressid) VALUES  (1, 1);
diff --git a/geonetwork/geonetwork/templates/srv.xml.j2 b/geonetwork/geonetwork/templates/srv.xml.j2
index 09a8c66e..2aa985f6 100644
--- a/geonetwork/geonetwork/templates/srv.xml.j2
+++ b/geonetwork/geonetwork/templates/srv.xml.j2
@@ -45,5 +45,9 @@
   <!--<import resource="../config-db/postgres.xml"/>-->
   <!--<import resource="../config-db/sqlserver.xml"/> -->
   <!--<import resource="../config-db/postgres-postgis.xml"/> -->
+{% if geonetwork_point_version >= 2 %}
   <import resource="../config-db/{{ geonetwork_db_type }}.xml"/>
+{% else %}
+  <import resource="../config-db/postgres.xml"/>
+{% endif %}
 </beans>