diff --git a/app/Livewire/Installer/PanelInstaller.php b/app/Livewire/Installer/PanelInstaller.php
index cbb98748c..a2961fade 100644
--- a/app/Livewire/Installer/PanelInstaller.php
+++ b/app/Livewire/Installer/PanelInstaller.php
@@ -15,13 +15,13 @@ use App\Traits\CheckMigrationsTrait;
 use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Schemas\Components\Form;
 use Filament\Schemas\Components\Wizard;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Notifications\Notification;
 use Filament\Pages\SimplePage;
 use Filament\Schemas\Components\Component;
-use Filament\Schemas\Contracts\HasSchemas;
-use Filament\Schemas\Schema;
 use Filament\Support\Enums\Width;
 use Filament\Support\Exceptions\Halt;
 use Illuminate\Support\Facades\Artisan;
@@ -29,9 +29,9 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
 /**
- * @property Schema $schema
+ * @property Form $form
  */
-class PanelInstaller extends SimplePage implements HasSchemas
+class PanelInstaller extends SimplePage implements HasForms
 {
     use CheckMigrationsTrait;
     use EnvironmentWriterTrait;
@@ -42,7 +42,7 @@ class PanelInstaller extends SimplePage implements HasSchemas
 
     protected string $view = 'filament.pages.installer';
 
-    public function getMaxWidth(): Width|string
+    public function getMaxContentWidth(): Width|string
     {
         return Width::SevenExtraLarge;
     }
@@ -56,10 +56,12 @@ class PanelInstaller extends SimplePage implements HasSchemas
     {
         abort_if(self::isInstalled(), 404);
 
-        $this->schema->fill();
+        $this->form->fill();
     }
 
-    /** @return Component[] */
+    /** @return Component[]
+     * @throws Exception
+     */
     protected function getFormSchema(): array
     {
         return [
diff --git a/app/Livewire/Installer/Steps/EnvironmentStep.php b/app/Livewire/Installer/Steps/EnvironmentStep.php
index af5751eab..d84061426 100644
--- a/app/Livewire/Installer/Steps/EnvironmentStep.php
+++ b/app/Livewire/Installer/Steps/EnvironmentStep.php
@@ -30,6 +30,7 @@ class EnvironmentStep
                 Fieldset::make('adminuser')
                     ->label('Admin User')
                     ->columns(3)
+                    ->columnSpanFull()
                     ->schema([
                         TextInput::make('user.email')
                             ->label('E-Mail')
diff --git a/resources/views/filament/pages/installer.blade.php b/resources/views/filament/pages/installer.blade.php
index 4963a2dc5..97bd3f539 100644
--- a/resources/views/filament/pages/installer.blade.php
+++ b/resources/views/filament/pages/installer.blade.php
@@ -1,5 +1,6 @@
 <x-filament-panels::page.simple>
-    <x-filament-panels::form wire:submit="submit">
+    <form wire:submit="submit">
         {{ $this->form }}
-    </x-filament-panels::form>
-</x-filament-panels::page.simple>
\ No newline at end of file
+    </form>
+    <x-filament-actions::modals />
+</x-filament-panels::page.simple>