diff --git a/src/extension/content-script/liquid.js b/src/extension/content-script/liquid.js
index 281431dd9d..65d22d4f24 100644
--- a/src/extension/content-script/liquid.js
+++ b/src/extension/content-script/liquid.js
@@ -70,9 +70,9 @@ async function init() {
 
       // Overrides the enable action so the user can go through onboarding to setup their keys
       if (!account || !account.hasMnemonic) {
-        const account = await api.getAccount();
+        account = await api.getAccount();
         if (!account.hasMnemonic) {
-          messageWithOrigin.action = `public/liquid/onboard`;
+          messageWithOrigin.action = ev.data.action = `public/liquid/onboard`;
         }
       }
 
diff --git a/src/extension/content-script/webbtc.js b/src/extension/content-script/webbtc.js
index ac353ab898..2470b6d4cd 100644
--- a/src/extension/content-script/webbtc.js
+++ b/src/extension/content-script/webbtc.js
@@ -68,9 +68,9 @@ async function init() {
 
       // Overrides the enable action so the user can go through onboarding to setup their keys
       if (!account || !account.hasMnemonic) {
-        const account = await api.getAccount();
+        account = await api.getAccount();
         if (!account.hasMnemonic) {
-          messageWithOrigin.action = `public/webbtc/onboard`;
+          messageWithOrigin.action = ev.data.action = `public/webbtc/onboard`;
         }
       }