diff --git a/src/components/Profile/ResetPasswordForm.tsx b/src/components/Profile/ResetPasswordForm.tsx
index 4bc5bd3ff..6b0f09b7a 100644
--- a/src/components/Profile/ResetPasswordForm.tsx
+++ b/src/components/Profile/ResetPasswordForm.tsx
@@ -60,7 +60,7 @@ export default function ResetPasswordForm() {
 
     // TODO: Redirect to login page after 2 seconds
     setTimeout(() => {
-      window.location.href = '/';
+      window.location.href = '/login';
     }, 2000);
   };
 
diff --git a/src/pages/forgot-password.astro b/src/pages/forgot-password.astro
index ab75f2dd5..b3d707744 100644
--- a/src/pages/forgot-password.astro
+++ b/src/pages/forgot-password.astro
@@ -16,3 +16,13 @@ import SettingLayout from '../layouts/SettingLayout.astro';
     </div>
   </div>
 </SettingLayout>
+
+<script>
+  import Cookies from 'js-cookie';
+  import { TOKEN_COOKIE_NAME } from '../lib/utils';
+  const token = Cookies.get(TOKEN_COOKIE_NAME);
+
+  if (token) {
+    window.location.href = '/';
+  }
+</script>
diff --git a/src/pages/login.astro b/src/pages/login.astro
new file mode 100644
index 000000000..2c4f16b0a
--- /dev/null
+++ b/src/pages/login.astro
@@ -0,0 +1,54 @@
+---
+import CaptchaFields from '../components/Captcha/CaptchaFields.astro';
+import CaptchaScripts from '../components/Captcha/CaptchaScripts.astro';
+import Divider from '../components/Login/Divider.astro';
+import GithubLogin from '../components/Login/GithubLogin.astro';
+import GoogleLogin from '../components/Login/GoogleLogin.astro';
+import EmailLoginForm from '../components/Login/EmailLoginForm';
+import BaseLayout from '../layouts/BaseLayout.astro';
+---
+
+<BaseLayout
+  title='Signup - roadmap.sh'
+  description='Register yourself to receive occasional emails about new roadmaps, updates, guides and videos'
+  permalink={'/signup'}
+  noIndex={true}
+>
+  <div class='container'>
+    <div
+      class='mx-auto flex flex-col items-start justify-start py-12 sm:min-h-[550px] sm:max-w-[400px] sm:items-center sm:justify-center sm:py-0'
+    >
+      <div class='mb-2 text-left sm:mb-5 sm:text-center'>
+        <h1 class='mb-2 text-3xl font-semibold sm:mb-4 sm:text-5xl'>Signup</h1>
+        <p class='text-md hidden text-gray-600 sm:block'>
+          Register yourself to receive occasional emails about new roadmaps,
+          updates, guides and videos
+        </p>
+        <p class='block text-sm text-gray-600 sm:hidden'>
+          Register yourself for occasional updates about roadmaps, guides and
+          videos.
+        </p>
+      </div>
+
+      <div class='flex w-full flex-col items-stretch space-y-2'>
+        <GithubLogin />
+        <GoogleLogin />
+      </div>
+
+      <Divider />
+
+      <EmailLoginForm client:load />
+    </div>
+  </div>
+
+  <CaptchaScripts slot='after-footer' />
+</BaseLayout>
+
+<script>
+  import Cookies from 'js-cookie';
+  import { TOKEN_COOKIE_NAME } from '../lib/utils';
+  const token = Cookies.get(TOKEN_COOKIE_NAME);
+  if (token) {
+    window.location.href = '/';
+  }
+</script>
diff --git a/src/pages/reset-password.astro b/src/pages/reset-password.astro
index 52b42d978..529b37182 100644
--- a/src/pages/reset-password.astro
+++ b/src/pages/reset-password.astro
@@ -10,10 +10,13 @@ import SettingLayout from '../layouts/SettingLayout.astro';
 </SettingLayout>
 
 <script>
+  import Cookies from 'js-cookie';
+  import { TOKEN_COOKIE_NAME } from '../lib/utils';
+  const token = Cookies.get(TOKEN_COOKIE_NAME);
   const urlParams = new URLSearchParams(window.location.search);
   const code = urlParams.get('code');
 
-  if (!code) {
+  if (!code || token) {
     window.location.href = '/settings/profile';
   }
 </script>