diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
index beaf982ab1..ddfcdaaf01 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
@@ -184,7 +184,10 @@ public class CBDatabase extends InternalDB<WebDatabaseConfig> {
         return getDatabaseDriver(dataSourceProviderRegistry);
     }
 
-    private void setDefaultUserAndPassword(@NotNull DBPDriver driver) {
+    private void setDefaultUserAndPassword(@NotNull DBPDriver driver) throws DBException {
+        if (!driver.isEmbedded() && CommonUtils.isEmpty(databaseConfig.getPassword())) {
+            throw new DBException("Password must be specified for non-embedded database");
+        }
         if (!CommonUtils.isEmpty(databaseConfig.getUser()) || !driver.isEmbedded()) {
             return;
         }