diff --git a/apps/nas-samba/source/app/server.js b/apps/nas-samba/source/app/server.js
index f44f7de..ec15d58 100644
--- a/apps/nas-samba/source/app/server.js
+++ b/apps/nas-samba/source/app/server.js
@@ -27,6 +27,8 @@ const DB_PATH = process.env.DB_PATH || '/config/cloudsync.db';
 const JWT_SECRET = process.env.JWT_SECRET || 'cloudsync_secret_key';
 const JWT_ALGORITHM = 'HS256';
 const JWT_EXPIRATION_HOURS = 24;
+const ADMIN_USERNAME = process.env.ADMIN_USERNAME || 'alexz';
+const ADMIN_PASSWORD = process.env.ADMIN_PASSWORD || process.env.SMB_PASSWORD || 'admin123';
 
 // ---------------------------------------------------------------------------
 // SQLite setup
@@ -1464,8 +1466,8 @@ function seedAdmin() {
     const adminId = crypto.randomUUID();
     sqlDb.prepare(
       'INSERT INTO users (id, username, password_hash, name, role, storage_quota, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)'
-    ).run(adminId, 'admin', hashPassword('admin123'), 'Administrator', 'admin', 107374182400, new Date().toISOString());
-    console.log('Default admin user created (admin/admin123)');
+    ).run(adminId, ADMIN_USERNAME, hashPassword(ADMIN_PASSWORD), 'Administrator', 'admin', 107374182400, new Date().toISOString());
+    console.log(`Admin user created: ${ADMIN_USERNAME}`);
   }
 }