diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
index 2412c97..201c43a 100644
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -50,5 +50,13 @@ class FortifyServiceProvider extends ServiceProvider
         Fortify::loginView(function () {
             return view('auth.login');
         });
+
+        Fortify::requestPasswordResetLinkView(function () {
+            return view('auth.forgot-password');
+        });
+
+        Fortify::resetPasswordView(function (Request $request) {
+            return view('auth.reset-password', ['request' => $request]);
+        });
     }
 }
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
new file mode 100644
index 0000000..810c2a9
--- /dev/null
+++ b/resources/views/auth/forgot-password.blade.php
@@ -0,0 +1,19 @@
+<x-layout.guest>
+    <x-slot:heading>I Forgot My Password</x-slot:heading>
+    <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]">
+        <div class="bg-white px-6 py-12 shadow sm:rounded-lg sm:px-12">
+            <div>
+                @if (session('status'))
+                    <div class="mb-4 font-medium text-sm text-green-600">
+                        {{ session('status') }}
+                    </div>
+                @endif
+            </div>
+            <form class="space-y-6" action="/forgot-password" method="POST">
+                @csrf
+                <x-auth.form-field name="email" label="Email address" type="email" autocomplete="email" required />
+                <x-auth.form-button>Send Password Reset</x-auth.form-button>
+            </form>
+        </div>
+    </div>
+</x-layout.guest>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index ad751f8..cdfb409 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -6,6 +6,7 @@
                 @csrf
                 <x-auth.form-field name="email" label="Email address" type="email" autocomplete="email" required />
                 <x-auth.form-field name="password" label="Password" type="password" required />
+                <x-auth.rememberme-forgotpassword />
                 <x-auth.form-button>Log In</x-auth.form-button>
             </form>
         </div>
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
new file mode 100644
index 0000000..d73ba58
--- /dev/null
+++ b/resources/views/auth/reset-password.blade.php
@@ -0,0 +1,15 @@
+<x-layout.guest>
+    <x-slot:heading>Reset Password</x-slot:heading>
+    <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]">
+        <div class="bg-white px-6 py-12 shadow sm:rounded-lg sm:px-12">
+            <form class="space-y-6" action="/reset-password" method="POST">
+                @csrf
+                <x-auth.form-field name="email" label="Email address" type="email" autocomplete="email" required />
+                <x-auth.form-field name="password" label="Password" type="password" required />
+                <x-auth.form-field name="password_confirmation" label="Confirm Password" type="password" required />
+                <input type="hidden" name="token" id="token" value="{{ request()->route('token') }}" >
+                <x-auth.form-button>Reset Password</x-auth.form-button>
+            </form>
+        </div>
+    </div>
+</x-layout.guest>
diff --git a/resources/views/components/auth/rememberme-forgotpassword.blade.php b/resources/views/components/auth/rememberme-forgotpassword.blade.php
index c68bd3b..5e1dc99 100644
--- a/resources/views/components/auth/rememberme-forgotpassword.blade.php
+++ b/resources/views/components/auth/rememberme-forgotpassword.blade.php
@@ -1,10 +1,10 @@
 <div class="flex items-center justify-between">
     <div class="flex items-center">
-        <input id="remember-me" name="remember-me" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
-        <label for="remember-me" class="ml-3 block text-sm leading-6 text-gray-900">Remember me</label>
+        <input id="remember" name="remember" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+        <label for="remember" class="ml-3 block text-sm leading-6 text-gray-900">Remember me</label>
     </div>
 
     <div class="text-sm leading-6">
-        <a href="#" class="font-semibold text-indigo-600 hover:text-indigo-500">Forgot password?</a>
+        <a href="/forgot-password" class="font-semibold text-indigo-600 hover:text-indigo-500">Forgot password?</a>
     </div>
 </div>