diff --git a/src/components/Login/email-login-form.tsx b/src/components/Login/EmailLoginForm.tsx
similarity index 81%
rename from src/components/Login/email-login-form.tsx
rename to src/components/Login/EmailLoginForm.tsx
index 0b0fc5138..d8321b7a5 100644
--- a/src/components/Login/email-login-form.tsx
+++ b/src/components/Login/EmailLoginForm.tsx
@@ -24,18 +24,25 @@ const EmailLoginForm: FunctionComponent<{}> = () => {
           body: JSON.stringify({
             email,
             password,
-            // name: 'Arikko',
           }),
-        }).then(async (res) => {
-          const json = await res.json();
-          if (res.status === 200) {
-            Cookies.set(TOKEN_COOKIE_NAME, json.token);
-            window.location.href = '/';
-          } else {
-            console.log('error', json);
-            setError(json);
-          }
-        });
+        })
+          .then(async (res) => {
+            const json = await res.json();
+            if (res.status === 200) {
+              Cookies.set(TOKEN_COOKIE_NAME, json.token);
+              window.location.href = '/';
+            } else {
+              const error = new Error(json.message) as any;
+              error.status = res.status;
+              throw error;
+            }
+          })
+          .catch((err) => {
+            setError({
+              message: err.message,
+              status: 400,
+            });
+          });
       }}
     >
       <label htmlFor="email" className="sr-only">
diff --git a/src/components/Login/EmailSignupForm.tsx b/src/components/Login/EmailSignupForm.tsx
new file mode 100644
index 000000000..7f66bdf44
--- /dev/null
+++ b/src/components/Login/EmailSignupForm.tsx
@@ -0,0 +1,114 @@
+import Cookies from 'js-cookie';
+import type { FunctionComponent } from 'preact';
+import { useState } from 'preact/hooks';
+import { TOKEN_COOKIE_NAME } from '../../lib/utils';
+
+const EmailSignupForm: FunctionComponent<{}> = () => {
+  const [email, setEmail] = useState<string>('');
+  const [password, setPassword] = useState<string>('');
+  const [name, setName] = useState<string>('');
+  const [message, setMessage] = useState<string | null>(null);
+  const [error, setError] = useState<{
+    message: string;
+    status: number;
+  } | null>(null);
+
+  return (
+    <form
+      className="w-full"
+      onSubmit={(e) => {
+        e.preventDefault();
+        fetch('http://localhost:8080/v1-register', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            email,
+            password,
+            name,
+          }),
+        })
+          .then(async (res) => {
+            const json = await res.json();
+            if (res.status === 200) {
+              setMessage(
+                'We have sent you an email. Please verify your account to login.'
+              );
+              setError(null);
+              console.log(json);
+            } else {
+              setMessage(null);
+              const error = new Error(json.message) as any;
+              error.status = res.status;
+              throw error;
+            }
+          })
+          .catch((err) => {
+            setMessage(null);
+            setError({
+              message: err.message,
+              status: 400,
+            });
+          });
+      }}
+    >
+      <label htmlFor="name" className="sr-only">
+        Name
+      </label>
+      <input
+        id="name"
+        name="name"
+        type="name"
+        autoComplete="name"
+        required
+        className="block w-full appearance-none rounded-lg border border-gray-300 px-3 py-2 shadow-sm  outline-none transition duration-150 ease-in-out placeholder:text-gray-400 focus:ring-2 focus:ring-black focus:ring-offset-1"
+        placeholder="Enter you name"
+        value={name}
+        onChange={(e) => setName(String((e.target as any).value))}
+      />
+      <label htmlFor="email" className="sr-only">
+        Email address
+      </label>
+      <input
+        id="email"
+        name="email"
+        type="email"
+        autoComplete="email"
+        required
+        className="mt-2 block w-full appearance-none rounded-lg border border-gray-300 px-3 py-2 shadow-sm  outline-none transition duration-150 ease-in-out placeholder:text-gray-400 focus:ring-2 focus:ring-black focus:ring-offset-1"
+        placeholder="Enter you email"
+        value={email}
+        onChange={(e) => setEmail(String((e.target as any).value))}
+      />
+      <label htmlFor="password" className="sr-only">
+        Password
+      </label>
+      <input
+        id="password"
+        name="password"
+        type="password"
+        autoComplete="current-password"
+        required
+        className="mt-2 block w-full appearance-none rounded-lg border border-gray-300 px-3 py-2 shadow-sm  outline-none transition duration-150 ease-in-out placeholder:text-gray-400 focus:ring-2 focus:ring-black focus:ring-offset-1"
+        placeholder="Enter you password"
+        value={password}
+        onChange={(e) => setPassword(String((e.target as any).value))}
+      />
+
+      {error && (
+        <div className="mt-2 text-sm text-red-500">{error.message}</div>
+      )}
+      {message && <div className="mt-2 text-sm text-green-500">{message}</div>}
+
+      <button
+        type="submit"
+        className="mt-3 inline-flex h-10 w-full items-center justify-center rounded-lg border border-slate-300 bg-black p-2 text-sm font-medium text-white outline-none transition duration-150 ease-in-out focus:ring-2 focus:ring-black focus:ring-offset-1 disabled:opacity-60"
+      >
+        Continue
+      </button>
+    </form>
+  );
+};
+
+export default EmailSignupForm;
diff --git a/src/components/Login/LoginCopmponent.astro b/src/components/Login/LoginCopmponent.astro
index 3e9b71014..20b3f49ba 100644
--- a/src/components/Login/LoginCopmponent.astro
+++ b/src/components/Login/LoginCopmponent.astro
@@ -1,8 +1,8 @@
 ---
 import Divider from './Divider.astro';
+import EmailLoginForm from './EmailLoginForm';
 import GithubLogin from './GithubLogin.astro';
 import GoogleLogin from './GoogleLogin.astro';
-import EmailLoginForm from './email-login-form';
 ---
 
 <div>
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index eb809863f..9410d257c 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -4,7 +4,7 @@ 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/email-login-form';
+import EmailSignupForm from '../components/Login/EmailSignupForm';
 import BaseLayout from '../layouts/BaseLayout.astro';
 ---
 
@@ -37,7 +37,7 @@ import BaseLayout from '../layouts/BaseLayout.astro';
 
       <Divider />
 
-      <EmailLoginForm client:load />
+      <EmailSignupForm client:load />
     </div>
   </div>