diff --git a/client/src/Components/inputs/TextInput.tsx b/client/src/Components/inputs/TextInput.tsx
index 718b60327..fd49fcdf2 100644
--- a/client/src/Components/inputs/TextInput.tsx
+++ b/client/src/Components/inputs/TextInput.tsx
@@ -38,6 +38,14 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function T
 					marginRight: 0,
 					marginTop: theme.spacing(1),
 				},
+				"& input:-webkit-autofill, & input:-webkit-autofill:hover, & input:-webkit-autofill:focus, & input:-webkit-autofill:active":
+					{
+						WebkitBoxShadow: `0 0 0 100px ${theme.palette.background.paper} inset`,
+						WebkitTextFillColor: theme.palette.text.primary,
+						caretColor: theme.palette.text.primary,
+						borderRadius: theme.shape.borderRadius,
+						transition: "background-color 5000s ease-in-out 0s",
+					},
 			}}
 		/>
 	);
diff --git a/client/src/Utils/Theme/Theme.ts b/client/src/Utils/Theme/Theme.ts
index 49c1636ec..bd175e8d1 100644
--- a/client/src/Utils/Theme/Theme.ts
+++ b/client/src/Utils/Theme/Theme.ts
@@ -120,11 +120,17 @@ export const theme = (mode: string, palette: any) =>
 
 			MuiOutlinedInput: {
 				styleOverrides: {
-					root: {
+					root: ({ theme }) => ({
+						"&:hover .MuiOutlinedInput-notchedOutline": {
+							borderColor:
+								theme.palette.mode === "dark"
+									? "rgba(255, 255, 255, 0.23)"
+									: theme.palette.text.primary,
+						},
 						"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
 							borderColor: palette.primary.main,
 						},
-					},
+					}),
 				},
 			},