diff --git a/admin/src/lib/db.ts b/admin/src/lib/db.ts
index 07d40d1..60f2aa7 100644
--- a/admin/src/lib/db.ts
+++ b/admin/src/lib/db.ts
@@ -1,7 +1,19 @@
 import { Pool } from 'pg';
 
+const connectionString = process.env.DATABASE_URL || 'postgresql://agendapro:agendapro123@localhost:5432/agendapro';
+
+// Extract password from connectionString manually just to check, or provide a fallback
+let fallbackPassword = process.env.DB_PASSWORD || process.env.POSTGRES_PASSWORD || '';
+try {
+  const url = new URL(connectionString);
+  if (!url.password) {
+    fallbackPassword = process.env.DB_PASSWORD || process.env.POSTGRES_PASSWORD || 'agendapro123';
+  }
+} catch (e) {}
+
 const pool = new Pool({
-  connectionString: process.env.DATABASE_URL || 'postgresql://agendapro:agendapro123@localhost:5432/agendapro',
+  connectionString,
+  password: fallbackPassword,
   max: 20,
   idleTimeoutMillis: 30000,
   connectionTimeoutMillis: 2000,
diff --git a/src/lib/db.ts b/src/lib/db.ts
index 07d40d1..60f2aa7 100644
--- a/src/lib/db.ts
+++ b/src/lib/db.ts
@@ -1,7 +1,19 @@
 import { Pool } from 'pg';
 
+const connectionString = process.env.DATABASE_URL || 'postgresql://agendapro:agendapro123@localhost:5432/agendapro';
+
+// Extract password from connectionString manually just to check, or provide a fallback
+let fallbackPassword = process.env.DB_PASSWORD || process.env.POSTGRES_PASSWORD || '';
+try {
+  const url = new URL(connectionString);
+  if (!url.password) {
+    fallbackPassword = process.env.DB_PASSWORD || process.env.POSTGRES_PASSWORD || 'agendapro123';
+  }
+} catch (e) {}
+
 const pool = new Pool({
-  connectionString: process.env.DATABASE_URL || 'postgresql://agendapro:agendapro123@localhost:5432/agendapro',
+  connectionString,
+  password: fallbackPassword,
   max: 20,
   idleTimeoutMillis: 30000,
   connectionTimeoutMillis: 2000,