diff --git a/alterardata.php b/alterardata.php
index 8759daf..94a646d 100644
--- a/alterardata.php
+++ b/alterardata.php
@@ -17,7 +17,7 @@ function alterardata($user, $data)
 function alterardatanew($id, $data)
 {
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
-    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr FROM users where id = $1";
 
@@ -38,7 +38,7 @@ function printvalidnew($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr FROM users WHERE id=$1";
     $params = array($id);
@@ -60,7 +60,7 @@ function printvalinew()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+    $conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/alterarlimite.php b/alterarlimite.php
index 1939154..c3a5a78 100644
--- a/alterarlimite.php
+++ b/alterarlimite.php
@@ -6,7 +6,7 @@ function printlim()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT * FROM users";
 
@@ -30,7 +30,7 @@ function uplimit($username, $newLimit)
             global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
             $query = "UPDATE users SET limi = $1 WHERE usr = $2";
             $params = array($newLimit, $username);
@@ -52,7 +52,7 @@ function printlim2($user)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT limi FROM users WHERE usr=$1";
     $params = array($user);
@@ -74,7 +74,7 @@ function uplimitnew($id, $limit)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr FROM users where id = $1";
 
@@ -95,7 +95,7 @@ function printlim2new($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT * FROM users WHERE id=$1";
     $params = array($id);
@@ -117,7 +117,7 @@ function printlimnew()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT * FROM users";
 
diff --git a/alterarsenha.php b/alterarsenha.php
index 4024b89..93e8ad4 100644
--- a/alterarsenha.php
+++ b/alterarsenha.php
@@ -5,7 +5,7 @@ function printpass()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT id,usr, pass FROM users";
 
@@ -38,7 +38,7 @@ function printpass2($user)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT pass FROM users WHERE usr=$1";
     $params = array($user);
@@ -59,7 +59,7 @@ function uppass2($username, $pass)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "UPDATE users SET pass = $1 WHERE usr = $2";
     $params = array($pass, $username);
@@ -75,7 +75,7 @@ function uppassnew($id, $pass)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr FROM users where id = $1";
 
@@ -97,7 +97,7 @@ function printpassnew($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr,pass FROM users WHERE id=$1";
     $params = array($id);
diff --git a/autostart.php b/autostart.php
index be4dba8..9ab41f9 100644
--- a/autostart.php
+++ b/autostart.php
@@ -6,7 +6,7 @@ function createautostart()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     if (!$conn) {
         echo "Failed to connect to PostgreSQL";
@@ -38,7 +38,7 @@ function incone($cone, $porta, $banner, $token, $tipo)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -60,7 +60,7 @@ function autostart()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -107,7 +107,7 @@ function deletecone($cone)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/database.php b/database.php
index d628423..b78bcb0 100644
--- a/database.php
+++ b/database.php
@@ -6,7 +6,7 @@ function createTable()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     if (!$conn) {
         echo "Failed to connect to PostgreSQL";
@@ -34,7 +34,7 @@ function retrieveDataAndCount()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -59,7 +59,7 @@ function insertData($user, $pass, $limi)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -100,7 +100,7 @@ function deleteData($user)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -122,7 +122,7 @@ function printusers()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -145,7 +145,7 @@ function printvalid()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -171,7 +171,7 @@ function printvalid2($user)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/expirado.php b/expirado.php
index cbdc4ee..aaf6bdc 100644
--- a/expirado.php
+++ b/expirado.php
@@ -8,7 +8,7 @@ function removeexpired()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/gbackup.php b/gbackup.php
index 0c74bee..af0e0b0 100644
--- a/gbackup.php
+++ b/gbackup.php
@@ -2,7 +2,7 @@
 
 function createbackup()
 {
-    $db = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+    $db = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     $tableData = array();
     $tables = array("users", "conestart");
 
diff --git a/postinstall.php b/postinstall.php
index 4652f43..9db9f7f 100644
--- a/postinstall.php
+++ b/postinstall.php
@@ -2,13 +2,37 @@
 
 function installpostgre()
 {
-    // Generate a secure random password (20 chars, URL-safe)
-    if (function_exists('random_bytes')) {
-        $bytes = random_bytes(16);
-    } else {
-        $bytes = openssl_random_pseudo_bytes(16);
+    $dir        = '/opt/DragonCore';
+    $configPath = $dir . '/config.php';
+
+    $password  = null;
+    $db_user   = 'dragoncore2';   // default user
+    $db_name   = 'dragoncore';    // default db name
+
+    // If config already exists, load existing password (and user if needed)
+    if (file_exists($configPath)) {
+        include $configPath; // defines $db_pass, $db_user, $db_name, etc.
+
+        if (isset($db_pass)) {
+            $password = $db_pass;
+        }
+        if (isset($db_user)) {
+            $db_user = $db_user;
+        }
+        if (isset($db_name)) {
+            $db_name = $db_name;
+        }
+    }
+
+    // If no password loaded from config, generate a new one
+    if ($password === null) {
+        if (function_exists('random_bytes')) {
+            $bytes = random_bytes(16);
+        } else {
+            $bytes = openssl_random_pseudo_bytes(16);
+        }
+        $password = substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, 20);
     }
-    $password = substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, 20);
 
     echo 'sudo apt update' . "\n";
     echo 'sudo apt install postgresql postgresql-contrib -y' . "\n";
@@ -16,14 +40,19 @@ function installpostgre()
     #echo 'sudo cp /etc/postgresql/' . $pgVersion . '/main/pg_hba.conf /etc/postgresql/' . $pgVersion . '/main/pg_hba.conf.bak' . "\n";
     #echo 'sudo sh -c "echo \'host    all             all             127.0.0.1/32            md5\' > /etc/postgresql/' . $pgVersion . '/main/pg_hba.conf"' . "\n";
     echo 'sudo systemctl restart postgresql' . "\n";
-    echo 'sudo -u postgres psql -c "CREATE DATABASE dragoncore;"' . "\n";
-    echo 'sudo -u postgres psql -c "CREATE USER dragoncore2 WITH PASSWORD \'' . $password . '\';"' . "\n";
-    echo 'sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE dragoncore TO dragoncore;"' . "\n";
-    echo 'sudo -u postgres psql -c "GRANT USAGE, CREATE ON SCHEMA public TO dragoncore;"' . "\n";
+    echo 'sudo -u postgres psql -c "CREATE DATABASE ' . $db_name . ';"' . "\n";
+    echo 'sudo -u postgres psql -c "CREATE USER ' . $db_user . ' WITH PASSWORD \'' . $password . '\';"' . "\n";
+    echo 'sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE ' . $db_name . ' TO ' . $db_user . ';"' . "\n";
+    echo 'sudo -u postgres psql -c "GRANT USAGE, CREATE ON SCHEMA public TO ' . $db_user . ';"' . "\n";
     echo 'sudo systemctl restart postgresql' . "\n";
 
+    // If config already existed, don't overwrite it
+    if (file_exists($configPath)) {
+        echo "Config file already exists at {$configPath}, not overwriting.\n";
+        return;
+    }
+
     // Ensure /opt/DragonCore exists
-    $dir = '/opt/DragonCore';
     if (!is_dir($dir)) {
         if (!mkdir($dir, 0755, true) && !is_dir($dir)) {
             fwrite(STDERR, "Failed to create directory: $dir\n");
@@ -36,12 +65,11 @@ function installpostgre()
 <?php
 \$db_host = '127.0.0.1';
 \$db_port = '5432';
-\$db_name = 'dragoncore';
-\$db_user = 'dragoncore2';
+\$db_name = '{$db_name}';
+\$db_user = '{$db_user}';
 \$db_pass = '{$password}';
 PHP;
 
-    $configPath = $dir . '/config.php';
     if (file_put_contents($configPath, $config) === false) {
         fwrite(STDERR, "Failed to write config file at {$configPath}\n");
     } else {
diff --git a/proxydragon.php b/proxydragon.php
index 36f6f70..7375d55 100644
--- a/proxydragon.php
+++ b/proxydragon.php
@@ -32,7 +32,7 @@ function createdbdragon()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     if (!$conn) {
         echo "Failed to connect to PostgreSQL";
@@ -101,7 +101,7 @@ function dragonprhash($hash)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -129,7 +129,7 @@ function del232409875892309ete()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -150,7 +150,7 @@ function dragonprhash2()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/relatoriouser.php b/relatoriouser.php
index 30fc012..44267af 100644
--- a/relatoriouser.php
+++ b/relatoriouser.php
@@ -6,7 +6,7 @@ function relatoriouser()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/removertodos.php b/removertodos.php
index 9e81652..26ce3c9 100644
--- a/removertodos.php
+++ b/removertodos.php
@@ -6,7 +6,7 @@ function deleteall()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
diff --git a/removeruser.php b/removeruser.php
index 8a4c2ef..0c0d517 100644
--- a/removeruser.php
+++ b/removeruser.php
@@ -15,7 +15,7 @@ function delusernew($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT usr FROM users where id = $1";
 
diff --git a/sshmonitor.php b/sshmonitor.php
index 3e9ece8..1f71e3e 100644
--- a/sshmonitor.php
+++ b/sshmonitor.php
@@ -6,7 +6,7 @@ function sshmonitor()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT * FROM users";
 
@@ -30,7 +30,7 @@ function sshmonitordragon()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     $query = "SELECT * FROM users";
 
diff --git a/v2ray.php b/v2ray.php
index 4136a2f..e01d9a0 100644
--- a/v2ray.php
+++ b/v2ray.php
@@ -7,7 +7,7 @@ function createv2table()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
 
     if (!$conn) {
         echo "Failed to connect to PostgreSQL";
@@ -36,7 +36,7 @@ function v2users()
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -60,7 +60,7 @@ function v2uid($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -82,7 +82,7 @@ function inv2($uuid, $nick, $valid)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }
@@ -200,7 +200,7 @@ function dlv2($id)
     global $db_host, $db_port, $db_name, $db_user, $db_pass;
 
 
-$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore 2password=$db_pass");
+$conn = pg_connect("host=localhost dbname=dragoncore user=dragoncore2 password=$db_pass");
     if (!$conn) {
         die("Connection failed: " . pg_last_error());
     }