diff --git a/resources/js/views/SetupWizard/Database.vue b/resources/js/views/SetupWizard/Database.vue
index 653f50c1..37cc451c 100644
--- a/resources/js/views/SetupWizard/Database.vue
+++ b/resources/js/views/SetupWizard/Database.vue
@@ -82,7 +82,7 @@
                         <input
                             v-model="databaseCredentials.name"
                             class="focus-border-theme input-dark"
-                            placeholder="Select your database name"
+                            placeholder="Type your database name"
                             type="text"
                             :class="{ '!border-rose-600': errors[0] }"
                         />
@@ -100,7 +100,7 @@
                         <input
                             v-model="databaseCredentials.username"
                             class="focus-border-theme input-dark"
-                            placeholder="Select your database name"
+                            placeholder="Type your database name"
                             type="text"
                             :class="{ '!border-rose-600': errors[0] }"
                         />
@@ -111,14 +111,13 @@
                     tag="div"
                     mode="passive"
                     name="Database Password"
-                    rules="required"
                     v-slot="{ errors }"
                 >
-                    <AppInputText title="Database Password" :error="errors[0]" :is-last="true">
+                    <AppInputText title="Database Password (optional)" :error="errors[0]" :is-last="true">
                         <input
                             v-model="databaseCredentials.password"
                             class="focus-border-theme input-dark"
-                            placeholder="Select your database password"
+                            placeholder="Type your database password"
                             type="text"
                             :class="{ '!border-rose-600': errors[0] }"
                         />
diff --git a/src/Domain/SetupWizard/Controllers/StoreDatabaseCredentialsController.php b/src/Domain/SetupWizard/Controllers/StoreDatabaseCredentialsController.php
index b5c1b62b..2e93cfff 100644
--- a/src/Domain/SetupWizard/Controllers/StoreDatabaseCredentialsController.php
+++ b/src/Domain/SetupWizard/Controllers/StoreDatabaseCredentialsController.php
@@ -27,7 +27,7 @@ class StoreDatabaseCredentialsController extends Controller
                         'port'     => $request->input('port'),
                         'database' => $request->input('name'),
                         'username' => $request->input('username'),
-                        'password' => $request->input('password'),
+                        'password' => $request->input('password') ?? '',
                     ],
                 ]);
 
@@ -51,7 +51,7 @@ class StoreDatabaseCredentialsController extends Controller
                 'DB_PORT'       => $request->input('port'),
                 'DB_DATABASE'   => $request->input('name'),
                 'DB_USERNAME'   => $request->input('username'),
-                'DB_PASSWORD'   => $request->input('password'),
+                'DB_PASSWORD'   => $request->input('password') ?? '',
             ]);
 
             Artisan::call('config:cache');
diff --git a/src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php b/src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php
index c9e6242c..4ae83f87 100644
--- a/src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php
+++ b/src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php
@@ -28,7 +28,7 @@ class StoreDatabaseCredentialsRequest extends FormRequest
             'port'       => 'required|string',
             'name'       => 'required|string',
             'username'   => 'required|string',
-            'password'   => 'required|string',
+            'password'   => 'nullable|sometimes|string',
         ];
     }
 }