diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
index b11ffe7ba..60abcf828 100644
--- a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
@@ -65,7 +65,7 @@ class CreateDatabaseHost extends CreateRecord
 
     }
 
-    protected function mutateFormDataBeforeSave(array $data): array
+    protected function mutateFormDataBeforeCreate(array $data): array
     {
         if (isset($data['password'])) {
             $data['password'] = encrypt($data['password']);
@@ -73,4 +73,17 @@ class CreateDatabaseHost extends CreateRecord
 
         return $data;
     }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form'),
+        ];
+
+    }
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
 }
diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php b/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
index 65672f916..2f3d84431 100644
--- a/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
@@ -63,6 +63,7 @@ class EditDatabaseHost extends EditRecord
     {
         return [
             Actions\DeleteAction::make(),
+            $this->getSaveFormAction()->formId('form'),
         ];
     }
 
@@ -74,4 +75,9 @@ class EditDatabaseHost extends EditRecord
 
         return $data;
     }
+
+    protected function getFormActions(): array
+    {
+        return [];
+    }
 }
diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php b/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
index 92e4bb289..769c546f3 100644
--- a/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
@@ -12,6 +12,8 @@ class ListDatabaseHosts extends ListRecords
 {
     protected static string $resource = DatabaseHostResource::class;
 
+    protected ?string $heading = 'Database Hosts';
+
     public function table(Table $table): Table
     {
         return $table
@@ -48,7 +50,7 @@ class ListDatabaseHosts extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make(),
+            Actions\CreateAction::make('create')->label('New Database Host'),
         ];
     }
 }