diff --git a/server/src/main/java/com/orientechnologies/orient/server/OServer.java b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
index 3da32641be0..7c38872a3a4 100755
--- a/server/src/main/java/com/orientechnologies/orient/server/OServer.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
@@ -946,25 +946,26 @@ protected void createDefaultServerUsers() throws IOException {
 
     OSecuritySystem securitySystem = databases.getSecuritySystem();
     if (securitySystem != null && !securitySystem.arePasswordsStored()) {
-      if (envRootPassword != null) {
-        final String pwd = envRootPassword;
-        getSystemDatabase()
-            .executeWithDB(
-                (db) -> {
-                  db.command(
-                          "update OUser set password= ? WHERE name = ?",
-                          pwd,
-                          OServerConfiguration.DEFAULT_ROOT_USER)
-                      .close();
-                  return (Void) null;
-                });
-      }
       return;
     }
 
+    boolean existServerUser = existsSystemUser(OServerConfiguration.DEFAULT_ROOT_USER);
+    if (existServerUser && envRootPassword != null) {
+      final String pwd = envRootPassword;
+      getSystemDatabase()
+          .executeWithDB(
+              (db) -> {
+                db.command(
+                        "update OUser set password= ? WHERE name = ?",
+                        pwd,
+                        OServerConfiguration.DEFAULT_ROOT_USER)
+                    .close();
+                return (Void) null;
+              });
+    }
+
     boolean existsRoot =
-        existsSystemUser(OServerConfiguration.DEFAULT_ROOT_USER)
-            || serverCfg.existsUser(OServerConfiguration.DEFAULT_ROOT_USER);
+        serverCfg.existsUser(OServerConfiguration.DEFAULT_ROOT_USER) || existServerUser;
 
     if (envRootPassword == null && !existsRoot) {
       try {