diff --git a/orientdb/templates/orientdb-server-config.xml.j2 b/orientdb/templates/orientdb-server-config.xml.j2
index bbc15839..c856dc3e 100644
--- a/orientdb/templates/orientdb-server-config.xml.j2
+++ b/orientdb/templates/orientdb-server-config.xml.j2
@@ -84,7 +84,7 @@
     </network>
     <storages/>
     <users>
-        <user resources="*" password="{{ orientdb_root_pwd }}" name="root"/>
+        <user resources="*" password="{{ orientdb_root_pwd }}" name="{{ orientdb_root_username }}"/>
     </users>
     <properties>
         <entry value="1" name="db.pool.min"/>
diff --git a/smartgears/resource_registry/templates/config.properties.j2 b/smartgears/resource_registry/templates/config.properties.j2
index 9a3ab33b..1d0638fb 100644
--- a/smartgears/resource_registry/templates/config.properties.j2
+++ b/smartgears/resource_registry/templates/config.properties.j2
@@ -3,7 +3,7 @@ REMOTE_PROTOCOL={{ orientdb_remote_protocol }}
 HTTP_PROTOCOL={{ orientdb_http_protocol }}
 HTTP_PORT={{ orientdb_http_port }}
 DB={{ orientdb_db_name }}
-USERNAME={{ orientdb_username }}
+USERNAME={{ orientdb_root_username }}
 PASSWORD={{ orientdb_root_pwd }}
 DEFAULT_CREATED_WRITER_USER_PASSWORD={{ orientdb_writer_password }}
 DEFAULT_CREATED_READER_USER_PASSWORD={{ orientdb_reader_password }}