diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index c04c127744..dda043450f 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -886,10 +886,7 @@
     "message": "Enable Auto-fill On Page Load"
   },
   "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"
+    "message": "If a login form is detected, automatically perform an auto-fill when the web page loads. This is a global setting which may be overridden by individual logins."
   },
   "autoFillOnPageLoadUseGlobalSettings": {
     "message": "Use Global Settings"
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index fcf3c48b7d..1dd3c6b651 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -262,11 +262,18 @@
         <div class="box">
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
-                    <label for="autofillOnPageLoad">{{'autoFillOnPageLoad' | i18n}}</label>
+                    <label for="autofillOnPageLoad">{{'enableAutoFillOnPageLoad' | 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>       
+            </div>
+            <div class="box-footer">
+                <b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}}
+            </div>
+        </div>
+        <div class="box">
+            <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="folder">{{'folder' | i18n}}</label>
                     <select id="folder" name="FolderId" [(ngModel)]="cipher.folderId">