diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index 2ced33461..239fa86bd 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -13,8 +13,9 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
+    public bool $revalidate = false;
 
-    protected $listeners = ['serverInstalled'];
+    protected $listeners = ['serverInstalled', 'revalidate' => '$refresh'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -68,8 +69,9 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-    public function revalidate() {
-        $this->validateServer();
+    public function revalidate()
+    {
+        $this->revalidate = true;
     }
     public function checkLocalhostConnection()
     {
diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php
index 4d37feca2..b5c46fa32 100644
--- a/app/Livewire/Server/ValidateAndInstall.php
+++ b/app/Livewire/Server/ValidateAndInstall.php
@@ -19,12 +19,12 @@ class ValidateAndInstall extends Component
     public $docker_version = null;
     public $proxy_started = false;
     public $error = null;
+    public bool $ask = false;
 
     protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
 
     public function init(bool $install = true)
     {
-
         $this->install = $install;
         $this->uptime = null;
         $this->supported_os_type = null;
@@ -34,9 +34,14 @@ class ValidateAndInstall extends Component
         $this->proxy_started = null;
         $this->error = null;
         $this->number_of_tries = 0;
-        $this->dispatch('validateServerNow');
+        if (!$this->ask) {
+            $this->dispatch('validateServerNow');
+        }
+    }
+    public function startValidatingAfterAsking() {
+        $this->ask = false;
+        $this->init();
     }
-
     public function validateServer()
     {
         try {
diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php
index 88ca49bb9..2777eb3ac 100644
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -241,7 +241,7 @@
                 </x-slot:question>
                 <x-slot:actions>
                     <x-slide-over closeWithX fullScreen>
-                        <x-slot:title>Validating & Configuring</x-slot:title>
+                        <x-slot:title>Validate & configure</x-slot:title>
                         <x-slot:content>
                             <livewire:server.validate-and-install :server="$this->createdServer" />
                         </x-slot:content>
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index b7af84d30..708a2dcd8 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -2,7 +2,7 @@
     <form wire:submit.prevent='submit' class="flex flex-col">
         <div class="flex gap-2">
             <h2>General</h2>
-            @if ($server->id === 0)
+            @if ($server->id !== 0)
                 <x-new-modal buttonTitle="Save" title="Change Localhost" action="submit">
                     You could lost a lot of functionalities if you change the server details of the server where Coolify
                     is
@@ -10,11 +10,15 @@
                 </x-new-modal>
             @else
                 <x-forms.button type="submit">Save</x-forms.button>
-                <x-new-modal buttonTitle="Revalidate" title="Revalidate" action="revalidate">
-                    This will revalidate the server, install / update Docker Engine, Docker Compose and all related
-                    configuration. It will also restart Docker Engine, so your running containers will be unreachable
-                    for the time being.
-                </x-new-modal>
+                <x-slide-over closeWithX fullScreen>
+                    <x-slot:title>Validate & configure</x-slot:title>
+                    <x-slot:content>
+                        <livewire:server.validate-and-install :server="$server" ask />
+                    </x-slot:content>
+                    <x-forms.button @click="slideOverOpen=true" wire:click.prevent='validateServer' isHighlighted>
+                        Revalidate server
+                    </x-forms.button>
+                </x-slide-over>
             @endif
         </div>
         @if ($server->isFunctional())
@@ -24,7 +28,7 @@
         @endif
         @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id !== 0)
             <x-slide-over closeWithX fullScreen>
-                <x-slot:title>Validating & Configuring</x-slot:title>
+                <x-slot:title>Validate & configure</x-slot:title>
                 <x-slot:content>
                     <livewire:server.validate-and-install :server="$server" />
                 </x-slot:content>
diff --git a/resources/views/livewire/server/validate-and-install.blade.php b/resources/views/livewire/server/validate-and-install.blade.php
index b243487df..35d5ab06a 100644
--- a/resources/views/livewire/server/validate-and-install.blade.php
+++ b/resources/views/livewire/server/validate-and-install.blade.php
@@ -1,29 +1,12 @@
 <div class="flex flex-col gap-2">
-    @if ($uptime)
-        <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
-                xmlns="http://www.w3.org/2000/svg">
-                <g fill="currentColor">
-                    <path
-                        d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                        opacity=".2" />
-                    <path
-                        d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                </g>
-            </svg></div>
+    @if ($ask)
+        This will revalidate the server, install / update Docker Engine, Docker Compose and all related
+        configuration. It will also restart Docker Engine, so your running containers will be unreachable
+        for the time being.
+        <x-forms.button isHighlighted wire:click='startValidatingAfterAsking    '>Continue</x-forms.button>
     @else
-        @if ($error)
-            <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path fill="currentColor"
-                        d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
-                </svg></div>
-        @else
-            <div class="w-64"><x-loading text="Server is reachable: " /></div>
-        @endif
-    @endif
-    @if ($uptime)
-        @if ($supported_os_type)
-            <div class="flex w-64 gap-2">Supported OS type: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
+        @if ($uptime)
+            <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">
                     <g fill="currentColor">
                         <path
@@ -41,46 +24,12 @@
                             d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
                     </svg></div>
             @else
-                <div class="w-64"><x-loading text="Server is reachable:" /></div>
+                <div class="w-64"><x-loading text="Server is reachable: " /></div>
             @endif
         @endif
-    @endif
-    @if ($uptime && $supported_os_type)
-        @if ($docker_installed)
-            <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <g fill="currentColor">
-                        <path
-                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                            opacity=".2" />
-                        <path
-                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                    </g>
-                </svg></div>
-        @else
-            @if ($error)
-                <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor"
-                            d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
-                    </svg></div>
-            @else
-                <div class="w-64"><x-loading text="Docker is installed:" /></div>
-            @endif
-        @endif
-        @if ($docker_compose_installed)
-            <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-success"
-                    viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="currentColor">
-                        <path
-                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                            opacity=".2" />
-                        <path
-                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                    </g>
-                </svg></div>
-            @if ($proxy_started)
-                <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
+        @if ($uptime)
+            @if ($supported_os_type)
+                <div class="flex w-64 gap-2">Supported OS type: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="currentColor">
                             <path
@@ -92,43 +41,101 @@
                     </svg></div>
             @else
                 @if ($error)
-                    <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
-                            xmlns="http://www.w3.org/2000/svg">
+                    <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                             <path fill="currentColor"
                                 d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
                         </svg></div>
                 @else
-                    <div class="w-64"><x-loading text="Proxy Started:" /></div>
+                    <div class="w-64"><x-loading text="Server is reachable:" /></div>
                 @endif
             @endif
-        @else
-            @if ($error)
-                <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-error"
+        @endif
+        @if ($uptime && $supported_os_type)
+            @if ($docker_installed)
+                <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-success"
                         viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor"
-                            d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        <g fill="currentColor">
+                            <path
+                                d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                opacity=".2" />
+                            <path
+                                d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                        </g>
                     </svg></div>
             @else
-                <div class="w-64"><x-loading text="Docker Compose is installed:" /></div>
+                @if ($error)
+                    <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        </svg></div>
+                @else
+                    <div class="w-64"><x-loading text="Docker is installed:" /></div>
+                @endif
             @endif
+            @if ($docker_compose_installed)
+                <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-success"
+                        viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="currentColor">
+                            <path
+                                d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                opacity=".2" />
+                            <path
+                                d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                        </g>
+                    </svg></div>
+                @if ($proxy_started)
+                    <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="currentColor">
+                                <path
+                                    d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                    opacity=".2" />
+                                <path
+                                    d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                            </g>
+                        </svg></div>
+                @else
+                    @if ($error)
+                        <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-error"
+                                viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                                <path fill="currentColor"
+                                    d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                            </svg></div>
+                    @else
+                        <div class="w-64"><x-loading text="Proxy Started:" /></div>
+                    @endif
+                @endif
+            @else
+                @if ($error)
+                    <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        </svg></div>
+                @else
+                    <div class="w-64"><x-loading text="Docker Compose is installed:" /></div>
+                @endif
+            @endif
+
         @endif
+        @isset($docker_version)
+            <div class="flex w-64 gap-2">Minimum Docker version installed: <svg class="w-5 h-5 text-success"
+                    viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                    <g fill="currentColor">
+                        <path
+                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                            opacity=".2" />
+                        <path
+                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                    </g>
+                </svg></div>
+        @endisset
 
+        <livewire:new-activity-monitor header="Logs" />
+        @isset($error)
+            <pre class="font-bold whitespace-pre-line text-error">{!! $error !!}</pre>
+        @endisset
     @endif
-    @isset($docker_version)
-        <div class="flex w-64 gap-2">Minimum Docker version installed: <svg class="w-5 h-5 text-success"
-                viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                <g fill="currentColor">
-                    <path
-                        d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                        opacity=".2" />
-                    <path
-                        d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                </g>
-            </svg></div>
-    @endisset
-
-    <livewire:new-activity-monitor header="Logs" />
-    @isset($error)
-        <pre class="font-bold whitespace-pre-line text-error">{!! $error !!}</pre>
-    @endisset
 </div>