diff --git a/src/content/autofiller.ts b/src/content/autofiller.ts
index a4a66b647a..2903e6f8cf 100644
--- a/src/content/autofiller.ts
+++ b/src/content/autofiller.ts
@@ -3,9 +3,18 @@ document.addEventListener("DOMContentLoaded", (event) => {
   let filledThisHref = false;
   let delayFillTimeout: number;
 
-  const enabledKey = "enableAutoFillOnPageLoad";
-  chrome.storage.local.get(enabledKey, (obj: any) => {
-    if (obj != null && obj[enabledKey] === true) {
+  const activeUserIdKey = "activeUserId";
+  let activeUserId: string;
+
+  chrome.storage.local.get(activeUserIdKey, (obj: any) => {
+    if (obj == null || obj[activeUserIdKey] == null) {
+      return;
+    }
+    activeUserId = obj[activeUserIdKey];
+  });
+
+  chrome.storage.local.get(activeUserId, (obj: any) => {
+    if (obj != null && obj[activeUserId].settings.enableAutoFillOnPageLoad === true) {
       setInterval(() => doFillIfNeeded(), 500);
     }
   });