diff --git a/client/app/components/input/index.tsx b/client/app/components/input/index.tsx
index f5ad75b1..4f53312b 100644
--- a/client/app/components/input/index.tsx
+++ b/client/app/components/input/index.tsx
@@ -10,7 +10,7 @@ type Props = React.HTMLProps<HTMLInputElement> & {
 }
 
 // we have two special rules on top of the props:
-// if onChange or value is passed, we require both
+// if onChange or value is passed, we require both, unless `disabled`
 // if label is passed, we forbid aria-label and vice versa
 type InputProps = Omit<Props, "onChange" | "value" | "label" | "aria-label"> &
 	(
@@ -22,6 +22,11 @@ type InputProps = Omit<Props, "onChange" | "value" | "label" | "aria-label"> &
 				onChange?: never
 				value?: never
 		  }
+		| {
+				value: Props["value"]
+				disabled: true
+				onChange?: never
+		  }
 	) &
 	(
 		| {
diff --git a/client/app/components/password-modal/index.tsx b/client/app/components/password-modal/index.tsx
index 21e71f66..a2feb21f 100644
--- a/client/app/components/password-modal/index.tsx
+++ b/client/app/components/password-modal/index.tsx
@@ -66,6 +66,7 @@ const PasswordModal = ({
 									label="Password"
 									type="password"
 									placeholder="Password"
+									value={password}
 									onChange={(e) => setPassword(e.currentTarget.value)}
 								/>
 								{creating && (
@@ -74,6 +75,7 @@ const PasswordModal = ({
 										label="Confirm"
 										type="password"
 										placeholder="Confirm Password"
+										value={confirmPassword}
 										onChange={(e) => setConfirmPassword(e.currentTarget.value)}
 									/>
 								)}
diff --git a/client/app/root-layout-wrapper.tsx b/client/app/root-layout-wrapper.tsx
index 34d4690e..702dfc11 100644
--- a/client/app/root-layout-wrapper.tsx
+++ b/client/app/root-layout-wrapper.tsx
@@ -17,7 +17,6 @@ export function LayoutWrapper({ children }: { children: React.ReactNode }) {
 						enableSystem={true}
 						defaultTheme="dark"
 						disableTransitionOnChange
-						cookieName={"drift-theme"}
 						attribute="data-theme"
 						enableColorScheme={true}
 					>