diff --git a/components/PasswordInput/index.tsx b/components/PasswordInput/index.tsx
index 04bb70e2..5271eb0d 100644
--- a/components/PasswordInput/index.tsx
+++ b/components/PasswordInput/index.tsx
@@ -7,7 +7,6 @@ import { faEye, faEyeSlash } from "@fortawesome/free-solid-svg-icons";
 
 interface Props extends InputHTMLAttributes<HTMLInputElement> {
   text?: string;
-  autocomplete?: string;
   fgColor: string;
   bgColor: string;
   enabled?: boolean;
@@ -16,10 +15,8 @@ interface Props extends InputHTMLAttributes<HTMLInputElement> {
 export default forwardRef<HTMLInputElement, Props>(function PasswordInput(
   {
     text = "PASSWORD",
-    id = "password",
-    name = "password",
     type = "password",
-    autocomplete = "current-password",
+    autoComplete = "current-password",
     fgColor,
     bgColor,
     ...rest
@@ -36,12 +33,10 @@ export default forwardRef<HTMLInputElement, Props>(function PasswordInput(
     <Input
       {...rest}
       text={text}
-      id={id}
-      name={name}
       type={isPasswordVisible ? "text" : "password"}
       fgColor="white"
       bgColor="primary"
-      autoComplete="current-password"
+      autoComplete={autoComplete}
       right={
         <FontAwesomeIcon
           className="mx-2 cursor-pointer"
diff --git a/layout/SignUp/components/SignUpForm/index.tsx b/layout/SignUp/components/SignUpForm/index.tsx
index 859599ba..2437590a 100644
--- a/layout/SignUp/components/SignUpForm/index.tsx
+++ b/layout/SignUp/components/SignUpForm/index.tsx
@@ -93,7 +93,12 @@ export default function SignUpForm() {
           bgColor="primary"
           onChange={(e) => updateNickname(e.currentTarget.value)}
         />
-        <PasswordInput text="PASSWORD" fgColor="white" bgColor="primary" />
+        <PasswordInput
+          text="PASSWORD"
+          fgColor="white"
+          bgColor="primary"
+          onChange={(e) => updatePassword(e.currentTarget.value)}
+        />
         <PasswordInput
           text="CONFIRM PASSWORD"
           fgColor="white"
diff --git a/pages/register/[uuid].js b/pages/register/[uuid].js
index 0ee1d834..d816eef2 100644
--- a/pages/register/[uuid].js
+++ b/pages/register/[uuid].js
@@ -69,11 +69,17 @@ function Register() {
             bgColor="primary"
             onChange={(e) => updateNickname(e.currentTarget.value)}
           />
-          <PasswordInput text="PASSWORD" fgColor="white" bgColor="primary" />
+          <PasswordInput
+            text="PASSWORD"
+            fgColor="white"
+            bgColor="primary"
+            onChange={(e) => updatePassword(e.currentTarget.value)}
+          />
           <PasswordInput
             text="CONFIRM PASSWORD"
             fgColor="white"
             bgColor="primary"
+            onChange={(e) => updatePasswordConfirmation(e.currentTarget.value)}
           />
           <Button
             type="submit"