diff --git a/app/Http/Controllers/MysqlController.php b/app/Http/Controllers/MysqlController.php
index bb38d4a..0dcfe65 100644
--- a/app/Http/Controllers/MysqlController.php
+++ b/app/Http/Controllers/MysqlController.php
@@ -161,7 +161,7 @@ class MysqlController extends Controller
         ];
 
         // Update password if provided
-        if ($newPassword) {
+        if ($request->filled('db_password')) {
             $updateData['db_password'] = $newPassword;
             
             // Update MySQL user password
diff --git a/resources/js/Pages/Mysql/Partials/EditDatabaseForm.jsx b/resources/js/Pages/Mysql/Partials/EditDatabaseForm.jsx
index 7a86c23..679de79 100644
--- a/resources/js/Pages/Mysql/Partials/EditDatabaseForm.jsx
+++ b/resources/js/Pages/Mysql/Partials/EditDatabaseForm.jsx
@@ -20,7 +20,7 @@ export default function EditDatabaseForm({ database }) {
     const [loading, setLoading] = useState(false);
 
     const { data, setData, patch, processing, reset, clearErrors, errors } = useForm({
-        id: database.id,
+        id: database.id || 0,
         charset: database.charset || 'utf8mb4',
         collation: database.collation || 'utf8mb4_unicode_ci',
         db_password: '',