diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 8665d2c325c..c04c1277443 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -888,6 +888,18 @@
   "enableAutoFillOnPageLoadDesc": {
     "message": "If a login form is detected, automatically perform an auto-fill when the web page loads."
   },
+  "autoFillOnPageLoad": {
+    "message": "Auto-fill On Page Load"
+  },
+  "autoFillOnPageLoadUseGlobalSettings": {
+    "message": "Use Global Settings"
+  },
+  "autoFillOnPageLoadAlways": {
+    "message": "Always"
+  },
+  "autoFillOnPageLoadNever": {
+    "message": "Never"
+  },
   "experimentalFeature": {
     "message": "This is currently an experimental feature. Use at your own risk."
   },
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index eba3c193cca..fcf3c48b7d0 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -261,6 +261,12 @@
         </div>
         <div class="box">
             <div class="box-content">
+                <div class="box-content-row" appBoxRow>
+                    <label for="autofillOnPageLoad">{{'autoFillOnPageLoad' | i18n}}</label>
+                    <select id="autofillOnPageLoad" name="AutofillOnPageLoad" [(ngModel)]="cipher.login.autofillOnPageLoad">
+                        <option *ngFor="let o of autofillOnPageLoadOptions" [ngValue]="o.value">{{o.name}}</option>
+                    </select>
+                </div>                
                 <div class="box-content-row" appBoxRow>
                     <label for="folder">{{'folder' | i18n}}</label>
                     <select id="folder" name="FolderId" [(ngModel)]="cipher.folderId">