diff --git a/app/assets/javascripts/discourse/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
index 63d81f88a6e..76f63dac1f0 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
@@ -4,6 +4,6 @@
              maxLength=titleMaxLength
              placeholderKey=composer.titlePlaceholder
              disabled=composer.loading
-             autocomplete="off"}}
+             autocomplete="discourse"}}
 
 {{popup-input-tip validation=validation}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 62473a5a82f..7ee33ef939a 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -7,7 +7,7 @@
                   tabindex="1"
                   usernames=usernames
                   hasGroups=hasGroups
-                  autocomplete="off"}}
+                  autocomplete="discourse"}}
 {{else}}
   <div class='ac-wrap composer-user-selector-limited' {{action "toggleSelector"}}>
     <span>{{limitedUsernames}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 41694e0b9db..b0aec1ede63 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -39,7 +39,7 @@
     </div>
 
     {{conditional-loading-spinner condition=loading}}
-    {{textarea autocomplete="off" tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}}
+    {{textarea autocomplete="discourse" tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}}
     {{popup-input-tip validation=validation}}
     {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
index 40c14709db3..dd04f149d36 100644
--- a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
@@ -19,7 +19,7 @@
 <div class='main-column'>
   <div class='filter'>
     {{d-icon 'search'}}
-    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="off"/>
+    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="discourse"/>
     <button class='clear-filter'>
       {{d-icon 'times'}}
     </button>
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index e8877238d36..6b3b461a0cf 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -24,7 +24,7 @@
         <form>
           <div class="input username-input">
             <label>{{i18n 'user.username.title'}}</label>
-            {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
+            {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
             &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
             <div class="instructions">{{i18n 'user.username.instructions'}}</div>
           </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 62b55d40e33..ecec3312b51 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -6,7 +6,7 @@
     {{user-selector single="true"
                     usernames=new_user
                     placeholderKey="topic.change_owner.placeholder"
-                    autocomplete="off"}}
+                    autocomplete="discourse"}}
   </form>
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 7b084f376b4..29daa50b7e4 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -28,7 +28,7 @@
             <tr class="input">
                   <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
                   <td>
-                  {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
+                  {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
                   </td>
             </tr>
             <tr class="instructions">
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index 40deca7ac3e..d8f44663ea4 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -22,7 +22,7 @@
           hasGroups=hasGroups
           usernames=emailOrUsername
           placeholderKey=placeholderKey
-          autocomplete="off"}}
+          autocomplete="discourse"}}
     {{else}}
       {{text-field value=emailOrUsername placeholderKey="topic.invite_reply.email_placeholder"}}
     {{/if}}