diff --git a/services/web/frontend/js/features/settings/components/password-section.tsx b/services/web/frontend/js/features/settings/components/password-section.tsx
index 2e68f5f3c6..bdc71ba068 100644
--- a/services/web/frontend/js/features/settings/components/password-section.tsx
+++ b/services/web/frontend/js/features/settings/components/password-section.tsx
@@ -200,6 +200,7 @@ function PasswordFormGroup({
         id={id}
         type="password"
         placeholder="*********"
+        autoComplete="new-password"
         value={value}
         data-ol-dirty={!!validationMessage}
         onChange={handleChangeAndValidity}
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index 506eb6ef70..24dc2013b7 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -70,6 +70,7 @@ block content
 															type='email',
 															name='email',
 															placeholder="email@example.com"
+															autocomplete="username"
 															required,
 															autofocus="true"
 														)
@@ -79,6 +80,7 @@ block content
 															type='password',
 															name='password',
 															placeholder="********",
+															autocomplete="new-password"
 															required,
 														)
 													.actions
@@ -109,6 +111,7 @@ block content
 															type='email',
 															name='email',
 															placeholder="email@example.com"
+															autocomplete="username"
 															required,
 															autofocus="true"
 														)
@@ -140,6 +143,7 @@ block content
 															type='email',
 															name='email',
 															placeholder="email@example.com"
+															autocomplete="username"
 															required,
 															autofocus="true"
 														)
diff --git a/services/web/modules/user-activate/app/views/user/activate.pug b/services/web/modules/user-activate/app/views/user/activate.pug
index a30ecc3bf8..649549c5ed 100644
--- a/services/web/modules/user-activate/app/views/user/activate.pug
+++ b/services/web/modules/user-activate/app/views/user/activate.pug
@@ -39,6 +39,7 @@ block content
 									type='email',
 									name='email',
 									placeholder="email@example.com",
+									autocomplete="username"
 									value=email
 									required,
 									disabled