diff --git a/lib/components/PasswordInput/index.tsx b/lib/components/PasswordInput/index.tsx
index f0fe5764..404c477e 100644
--- a/lib/components/PasswordInput/index.tsx
+++ b/lib/components/PasswordInput/index.tsx
@@ -1,6 +1,7 @@
 import React, {
   ChangeEvent,
   ComponentProps,
+  FocusEvent,
   useCallback,
   useMemo,
   useState,
@@ -19,6 +20,7 @@ import {
 import { EyeIcon, EyeIconSlash } from "./PasswordIcon";
 import { PasswordMeter } from "./PasswordMeter";
 import "./PasswordInput.scss";
+import clsx from "clsx";
 
 export const validatePassword = (password: string) => {
   const score = calculateScore(password);
@@ -40,11 +42,8 @@ export const validatePassword = (password: string) => {
 
 type InputProps = ComponentProps<typeof Input>;
 
-interface PasswordInputProps
-  extends Pick<
-    InputProps,
-    "value" | "onChange" | "label" | "id" | "autoComplete"
-  > {
+interface PasswordInputProps extends Omit<InputProps, "variant"> {
+  wrapperClassName?: string;
   hidePasswordMeter?: boolean;
   hint?: string;
 }
@@ -58,50 +57,49 @@ const PasswordVariant: Record<TScore, InputProps["variant"]> = {
 };
 
 export const PasswordInput = ({
-  autoComplete,
-  id,
-  label,
-  value,
-  onChange,
   hint,
   hidePasswordMeter,
+  wrapperClassName,
+  ...rest
 }: PasswordInputProps) => {
   const [isTouched, setIsTouched] = useState(false);
   const [showPassword, setShowPassword] = useState(false);
 
   const { errorMessage, score } = useMemo(
-    () => validatePassword(value as string),
-    [value]
+    () => validatePassword(rest.value as string),
+    [rest.value]
   );
 
   const handleChange = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
-      onChange?.(e);
+      rest.onChange?.(e);
       if (!isTouched) {
         setIsTouched(true);
       }
     },
-    [isTouched, onChange]
+    [isTouched, rest.onChange]
   );
 
-  const handleBlur = useCallback(() => {
-    if (!isTouched) {
-      setIsTouched(true);
-    }
-  }, [isTouched]);
+  const handleBlur = useCallback(
+    (e: FocusEvent<HTMLInputElement>) => {
+      if (!isTouched) {
+        setIsTouched(true);
+      }
+      rest.onBlur?.(e);
+    },
+    [isTouched]
+  );
 
   return (
-    <div className="deriv-password">
+    <div className={clsx("deriv-password", wrapperClassName)}>
       <Input
-        autoComplete={autoComplete}
-        id={id}
-        label={label}
         type={showPassword ? "text" : "password"}
-        value={value}
         message={isTouched ? errorMessage : "" || hint}
         onChange={handleChange}
         onBlur={handleBlur}
-        variant={isTouched ? PasswordVariant[score as TScore] : "general"}
+        variant={
+          isTouched || rest.value ? PasswordVariant[score as TScore] : "general"
+        }
         rightPlaceholder={
           <button
             className="deriv-password__icon"
@@ -110,6 +108,7 @@ export const PasswordInput = ({
             {showPassword ? <EyeIcon /> : <EyeIconSlash />}
           </button>
         }
+        {...rest}
       />
       {!hidePasswordMeter && <PasswordMeter score={score as TScore} />}
     </div>
diff --git a/src/stories/PasswordInput.stories.ts b/src/stories/PasswordInput.stories.tsx
similarity index 77%
rename from src/stories/PasswordInput.stories.ts
rename to src/stories/PasswordInput.stories.tsx
index 9910c84c..c3d7ebf2 100644
--- a/src/stories/PasswordInput.stories.ts
+++ b/src/stories/PasswordInput.stories.tsx
@@ -1,5 +1,6 @@
 import { StoryObj, Meta } from "@storybook/react";
 import { PasswordInput } from "../../lib/main";
+import { useState } from "react";
 
 const meta = {
   title: "Components/PasswordInput",
@@ -26,6 +27,11 @@ const meta = {
         disable: true,
       },
     },
+    value: {
+      control: {
+        disable: true,
+      },
+    },
     onChange: {
       control: {
         disable: true,
@@ -50,4 +56,15 @@ export const Default: Story = {
     onChange: () => {},
     hidePasswordMeter: false,
   },
+  render: (args) => {
+    const [value, setValue] = useState("");
+
+    return (
+      <PasswordInput
+        {...args}
+        value={value}
+        onChange={(e) => setValue(e.target.value)}
+      />
+    );
+  },
 };