diff --git a/app/Livewire/Profile/Index.php b/app/Livewire/Profile/Index.php
index 3499d4ff9..abfc0b972 100644
--- a/app/Livewire/Profile/Index.php
+++ b/app/Livewire/Profile/Index.php
@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Profile;
 
+use Illuminate\Support\Facades\Hash;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
@@ -10,6 +11,13 @@ class Index extends Component
     public int $userId;
     public string $email;
 
+    #[Validate('required')]
+    public string $current_password;
+    #[Validate('required|min:8')]
+    public string $new_password;
+    #[Validate('required|min:8|same:new_password')]
+    public string $new_password_confirmation;
+
     #[Validate('required')]
     public string $name;
     public function mount()
@@ -19,7 +27,6 @@ class Index extends Component
         $this->email = auth()->user()->email;
     }
     public function submit()
-
     {
         try {
             $this->validate();
@@ -27,7 +34,30 @@ class Index extends Component
                 'name' => $this->name,
             ]);
 
-            $this->dispatch('success', 'Profile updated');
+            $this->dispatch('success', 'Profile updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function resetPassword()
+    {
+        try {
+            $this->validate();
+            if (!Hash::check($this->current_password, auth()->user()->password)) {
+                $this->dispatch('error', 'Current password is incorrect.');
+                return;
+            }
+            if ($this->new_password !== $this->new_password_confirmation) {
+                $this->dispatch('error', 'The two new passwords does not match.');
+                return;
+            }
+            auth()->user()->update([
+                'password' => Hash::make($this->new_password),
+            ]);
+            $this->dispatch('success', 'Password updated.');
+            $this->current_password = '';
+            $this->new_password = '';
+            $this->new_password_confirmation = '';
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/resources/views/livewire/force-password-reset.blade.php b/resources/views/livewire/force-password-reset.blade.php
index d6951d0ad..d77651675 100644
--- a/resources/views/livewire/force-password-reset.blade.php
+++ b/resources/views/livewire/force-password-reset.blade.php
@@ -5,9 +5,7 @@
                 <div class="text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
             </a>
         </div>
-        <div class="flex items-center justify-center pb-4 text-center">
-            Set your initial password
-        </div>
+        
         <form class="flex flex-col gap-2" wire:submit='submit'>
             <x-forms.input id="email" type="email" placeholder="Email" readonly label="Email" />
             <x-forms.input id="password" type="password" placeholder="New Password" label="New Password" required />
diff --git a/resources/views/livewire/profile/index.blade.php b/resources/views/livewire/profile/index.blade.php
index aa8cb5708..af4de1b2b 100644
--- a/resources/views/livewire/profile/index.blade.php
+++ b/resources/views/livewire/profile/index.blade.php
@@ -6,13 +6,22 @@
             <h2>General</h2>
             <x-forms.button type="submit" label="Save">Save</x-forms.button>
         </div>
-        <div class="flex gap-2">
+        <div class="flex flex-col gap-2 lg:flex-row">
             <x-forms.input id="name" label="Name" required />
             <x-forms.input id="email" label="Email" readonly />
         </div>
     </form>
-    <h2 class="py-4">Subscription</h2>
-    <a href="{{ route('team.index') }}">Check in Team Settings</a>
+    <form wire:submit='resetPassword' class="flex flex-col max-w-xl pt-4">
+        <div class="flex items-center gap-2">
+            <h2>Reset Password</h2>
+            <x-forms.button type="submit" label="Save">Reset</x-forms.button>
+        </div>
+        <div class="flex flex-col gap-2">
+            <x-forms.input id="current_password" label="Current Password" required type="password" />
+            <x-forms.input id="new_password" label="New Password" required type="password" />
+            <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
+        </div>
+    </form>
     <h2 class="py-4">Two-factor Authentication</h2>
     @if (session('status') == 'two-factor-authentication-enabled')
         <div class="mb-4 font-medium">