diff --git a/packages/game-app/src/_shared/components/PasswordInput/PasswordInput.tsx b/packages/game-app/src/_shared/components/PasswordInput/PasswordInput.tsx
index 84051436..c2b0479e 100644
--- a/packages/game-app/src/_shared/components/PasswordInput/PasswordInput.tsx
+++ b/packages/game-app/src/_shared/components/PasswordInput/PasswordInput.tsx
@@ -21,6 +21,7 @@ type Props = {
   errorMessage?: string | null;
   onForgotPassword?: () => void;
   forgotPasswordLabel?: string;
+  autocomplete?: React.ComponentProps<typeof Input>['autocomplete'];
   tabIndex?: React.ComponentProps<typeof Input>['tabIndex'];
 };
 
@@ -37,6 +38,7 @@ const PasswordInput = React.forwardRef<HTMLInputElement, Props>(
       forgotPasswordLabel,
       onForgotPassword,
       tabIndex,
+      autocomplete,
     },
     ref,
   ) => {
@@ -62,7 +64,7 @@ const PasswordInput = React.forwardRef<HTMLInputElement, Props>(
         <Input
           ref={ref}
           variant={!!errorMessage ? 'defaultError' : 'default'}
-          autoComplete="new-password"
+          autocomplete={autocomplete}
           iconRight={
             <IconButton variant="clearSmall" onClick={toggleType} tabIndex={-1}>
               <StyledIcon variant="small">{type === 'password' ? <EyeIcon /> : <HideIcon />}</StyledIcon>
diff --git a/packages/game-app/src/_shared/components/TextInput/TextInput.tsx b/packages/game-app/src/_shared/components/TextInput/TextInput.tsx
index f0e8c523..5312662e 100644
--- a/packages/game-app/src/_shared/components/TextInput/TextInput.tsx
+++ b/packages/game-app/src/_shared/components/TextInput/TextInput.tsx
@@ -17,11 +17,24 @@ type Props = {
   type?: string;
   disabled?: boolean;
   tabIndex?: React.ComponentProps<typeof Input>['tabIndex'];
+  autocomplete?: React.ComponentProps<typeof Input>['autocomplete'];
 };
 
 const TextInput = React.forwardRef<HTMLInputElement, Props>(
   (
-    { name, value, errorMessage, label, labelDetails, placeholder, onChange, type = 'text', disabled, tabIndex },
+    {
+      name,
+      value,
+      errorMessage,
+      label,
+      labelDetails,
+      placeholder,
+      onChange,
+      type = 'text',
+      disabled,
+      tabIndex,
+      autocomplete,
+    },
     ref,
   ) => {
     return (
@@ -45,6 +58,7 @@ const TextInput = React.forwardRef<HTMLInputElement, Props>(
           id={name}
           onChange={onChange}
           tabIndex={tabIndex}
+          autocomplete={autocomplete}
         />
         {errorMessage ? <ErrorMessage message={errorMessage} /> : null}
       </InputContainer>
diff --git a/packages/game-app/src/_shared/form/FormTextField/FormTextField.tsx b/packages/game-app/src/_shared/form/FormTextField/FormTextField.tsx
index 6478c092..db136300 100644
--- a/packages/game-app/src/_shared/form/FormTextField/FormTextField.tsx
+++ b/packages/game-app/src/_shared/form/FormTextField/FormTextField.tsx
@@ -26,6 +26,7 @@ type Props = {
   CustomInput?: React.ComponentType<React.ComponentProps<typeof TextInput>>;
   disabled?: boolean;
   tabIndex?: React.ComponentProps<typeof TextInput>['tabIndex'];
+  autocomplete?: React.ComponentProps<typeof TextInput>['autocomplete'];
 };
 
 /**
diff --git a/packages/game-app/src/forgotPassword/components/ForgotPassword/ForgotPassword.tsx b/packages/game-app/src/forgotPassword/components/ForgotPassword/ForgotPassword.tsx
index 7cb66c6b..e950054b 100644
--- a/packages/game-app/src/forgotPassword/components/ForgotPassword/ForgotPassword.tsx
+++ b/packages/game-app/src/forgotPassword/components/ForgotPassword/ForgotPassword.tsx
@@ -64,6 +64,7 @@ const ForgotPassword: React.FC<Props> = () => {
                     name="email"
                     label={t('forgotPassword.form.email.label')}
                     placeholder={t('forgotPassword.form.email.placeholder')}
+                    autocomplete="email"
                   />
                   <Box textAlign="center" mt={5}>
                     <Button
diff --git a/packages/game-app/src/forgotPassword/components/ResetPassword/ResetPassword.tsx b/packages/game-app/src/forgotPassword/components/ResetPassword/ResetPassword.tsx
index c6374599..96a426de 100644
--- a/packages/game-app/src/forgotPassword/components/ResetPassword/ResetPassword.tsx
+++ b/packages/game-app/src/forgotPassword/components/ResetPassword/ResetPassword.tsx
@@ -79,6 +79,7 @@ const ResetPassword: React.FC<Props> = () => {
                     placeholder={t('resetPassword.form.password.placeholder')}
                     labelDetails={t('auth.errors.passwordRequirements')}
                     disabled={resetLoading || verifyActionCodeLoading}
+                    autocomplete="new-password"
                   />
                   <Box mt={3}>
                     <FormTextField
@@ -87,6 +88,7 @@ const ResetPassword: React.FC<Props> = () => {
                       label={t('resetPassword.form.repeatPassword.label')}
                       placeholder={t('resetPassword.form.repeatPassword.placeholder')}
                       disabled={resetLoading || verifyActionCodeLoading}
+                      autocomplete="new-password"
                     />
                   </Box>
                   <Box textAlign="center" mt={5}>
diff --git a/packages/game-app/src/login/components/Login/Login.tsx b/packages/game-app/src/login/components/Login/Login.tsx
index 0ffb1e10..4c2adde2 100644
--- a/packages/game-app/src/login/components/Login/Login.tsx
+++ b/packages/game-app/src/login/components/Login/Login.tsx
@@ -57,6 +57,7 @@ const Login: React.FC<Props> = () => {
                   name="email"
                   label={t('login.form.email.label')}
                   placeholder={t('login.form.email.placeholder')}
+                  autocomplete="email"
                 />
                 <Box mt={3}>
                   <FormTextField
@@ -64,6 +65,7 @@ const Login: React.FC<Props> = () => {
                     name="password"
                     label={t('login.form.password.label')}
                     placeholder={t('login.form.password.placeholder')}
+                    autocomplete="current-password"
                     {...passwordProps}
                   />
                 </Box>
diff --git a/packages/game-app/src/signup/components/Signup/Signup.tsx b/packages/game-app/src/signup/components/Signup/Signup.tsx
index 25d42a0b..00dab004 100644
--- a/packages/game-app/src/signup/components/Signup/Signup.tsx
+++ b/packages/game-app/src/signup/components/Signup/Signup.tsx
@@ -76,6 +76,7 @@ const Signup: React.FC<Props> = () => {
                         name="firstName"
                         label={t('signup.form.firstName.label')}
                         placeholder={t('signup.form.firstName.placeholder')}
+                        autocomplete="given-name"
                       />
                     </Box>
                     <Box flex={1} ml={3}>
@@ -83,6 +84,7 @@ const Signup: React.FC<Props> = () => {
                         name="lastName"
                         label={t('signup.form.lastName.label')}
                         placeholder={t('signup.form.lastName.placeholder')}
+                        autocomplete="family-name"
                       />
                     </Box>
                   </Box>
@@ -92,6 +94,7 @@ const Signup: React.FC<Props> = () => {
                       name="email"
                       label={t('signup.form.email.label')}
                       placeholder={t('signup.form.email.placeholder')}
+                      autocomplete="email"
                     />
                   </Box>
                   <Box mt={3} display="flex" flexDirection="row">
@@ -102,6 +105,7 @@ const Signup: React.FC<Props> = () => {
                         label={t('signup.form.password.label')}
                         labelDetails={t('auth.errors.passwordRequirements')}
                         placeholder={t('signup.form.password.placeholder')}
+                        autocomplete="new-password"
                       />
                     </Box>
                     <Box flex={1} ml={3}>
@@ -110,6 +114,7 @@ const Signup: React.FC<Props> = () => {
                         name="repeatPassword"
                         label={t('signup.form.repeatPassword.label')}
                         placeholder={t('signup.form.repeatPassword.placeholder')}
+                        autocomplete="new-password"
                       />
                     </Box>
                   </Box>