diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index 3b14b5bf793..10275ebf971 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -30,7 +30,7 @@
           usernames=emailOrUsername
           placeholderKey=placeholderKey
           class="invite-user-input"
-          autocomplete="off"}}
+          autocomplete="discourse"}}
       {{else}}
         {{text-field
           class="email-or-username-input"
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 142f7f3ffa1..d4cd3cdf70d 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -52,7 +52,7 @@
     {{#unless isNumber}}
       <div class="input-group poll-textarea">
         <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
-        {{textarea value=pollOptions}}
+        {{textarea value=pollOptions autocomplete="discourse"}}
         {{input-tip validation=minNumOfOptionsValidation}}
       </div>
     {{/unless}}