diff --git a/frontend/web/components/SimpleTwoFactor/prompt.js b/frontend/web/components/SimpleTwoFactor/prompt.js
index 4f78664bcbc0..1b5a0c42b9b1 100644
--- a/frontend/web/components/SimpleTwoFactor/prompt.js
+++ b/frontend/web/components/SimpleTwoFactor/prompt.js
@@ -28,6 +28,7 @@ export default class TheComponent extends PureComponent {
         >
           <InputGroup
             inputProps={{
+              autocomplete: 'one-time-code',
               className: 'full-width',
               style: { paddingLeft: 10, textIndent: 0 },
             }}
diff --git a/frontend/web/components/base/forms/Input.js b/frontend/web/components/base/forms/Input.js
index 2678e109bd8d..e33b5e9527dc 100644
--- a/frontend/web/components/base/forms/Input.js
+++ b/frontend/web/components/base/forms/Input.js
@@ -154,7 +154,7 @@ const Input = class extends React.Component {
             className={innerClassName}
             disabled={disabled}
             autoComplete={
-              this.props.enableAutoComplete ? undefined : 'one-time-code'
+              this.props.enableAutoComplete ?? this.props.autocomplete
             }
           />
         )}
@@ -214,6 +214,7 @@ Input.defaultProps = {
 }
 
 Input.propTypes = {
+  autocomplete: propTypes.string,
   className: propTypes.any,
   inputClassName: OptionalString,
   isValid: propTypes.any,
diff --git a/frontend/web/components/modals/ChangeEmailAddress.tsx b/frontend/web/components/modals/ChangeEmailAddress.tsx
index 4bbe59459923..02cb0b01660b 100644
--- a/frontend/web/components/modals/ChangeEmailAddress.tsx
+++ b/frontend/web/components/modals/ChangeEmailAddress.tsx
@@ -85,6 +85,7 @@ const ChangeEmailAddress: FC<ChangeEmailAddressType> = ({ onComplete }) => {
                 setPassword(Utils.safeParseEventValue(event))
               }}
               type='password'
+              autocomplete='current-password'
               name='password'
             />
             {isError && (
diff --git a/frontend/web/components/pages/AccountSettingsPage.js b/frontend/web/components/pages/AccountSettingsPage.js
index 4c05b067fb59..4f8d6b43b728 100644
--- a/frontend/web/components/pages/AccountSettingsPage.js
+++ b/frontend/web/components/pages/AccountSettingsPage.js
@@ -387,6 +387,7 @@ class TheComponent extends Component {
                             }
                             type='password'
                             name='Current Password*'
+                            autocomplete='current-password'
                           />
                           <InputGroup
                             className='mt-4'
@@ -404,6 +405,7 @@ class TheComponent extends Component {
                             }
                             isValid={new_password1 && new_password1.length}
                             type='password'
+                            autocomplete='new-password'
                             name='New Password*'
                           />
                           <InputGroup
@@ -422,6 +424,7 @@ class TheComponent extends Component {
                             }
                             isValid={new_password2 && new_password2.length}
                             type='password'
+                            autocomplete='new-password'
                             name='Confirm New Password*'
                           />
                           {passwordError && (