diff --git a/BTCPayServer/Views/Account/LoginWithU2F.cshtml b/BTCPayServer/Views/Account/LoginWithU2F.cshtml
index 4304bcc4f..fdad50850 100644
--- a/BTCPayServer/Views/Account/LoginWithU2F.cshtml
+++ b/BTCPayServer/Views/Account/LoginWithU2F.cshtml
@@ -32,19 +32,21 @@
 
 <script src="~/vendor/u2f/u2f-api-1.1.1.js" asp-append-version="true"></script>
 <script type="text/javascript">
-    window.u2fApi.sign(
-        @Safe.Json(Model.Challenges)
-    )
-    .then(data => {
-        document.getElementById("DeviceResponse").value = JSON.stringify(data);
-        document.getElementById("u2fForm").submit();
-    })
-    .catch(error => {
-        document.getElementById("error-message").innerText = error.message;
-        document.getElementById("error-message").classList.remove("d-none");
-        document.getElementById("spinner").classList.add("d-none");
-        if (!error.message.endsWith("not supported")) {
-            document.getElementById("btn-retry").classList.remove("d-none");
-        }
+    document.addEventListener("DOMContentLoaded", () => {
+        window.u2fApi.sign(
+            @Safe.Json(Model.Challenges)
+        )
+        .then(data => {
+            document.getElementById("DeviceResponse").value = JSON.stringify(data);
+            document.getElementById("u2fForm").submit();
+        })
+        .catch(error => {
+            document.getElementById("error-message").innerText = error.message;
+            document.getElementById("error-message").classList.remove("d-none");
+            document.getElementById("spinner").classList.add("d-none");
+            if (!error.message.endsWith("not supported")) {
+                document.getElementById("btn-retry").classList.remove("d-none");
+            }
+        });
     });
 </script>
diff --git a/BTCPayServer/Views/Manage/AddU2FDevice.cshtml b/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
index 5bde11b8e..f15ccc2cd 100644
--- a/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
+++ b/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
@@ -34,20 +34,22 @@
 @section Scripts {
     <script src="~/vendor/u2f/u2f-api-1.1.1.js" asp-append-version="true"></script>
     <script type="text/javascript">
-        window.u2fApi.register([{
-            appId: @Safe.Json(Model.AppId),
-            version: @Safe.Json(Model.Version),
-            challenge: @Safe.Json(Model.Challenge)
-        }])
-        .then(data => {
-            document.getElementById("DeviceResponse").value = JSON.stringify(data);
-            document.getElementById("registerForm").submit();
-        })
-        .catch(message => {
-            document.getElementById("error-message").classList.remove("d-none");
-            document.getElementById("error-message").innerText = message;
-            document.getElementById("btn-back").innerText = "Retry";
-            document.getElementById("spinner").classList.add("d-none");
+        document.addEventListener("DOMContentLoaded", () => {
+            window.u2fApi.register([{
+                appId: @Safe.Json(Model.AppId),
+                version: @Safe.Json(Model.Version),
+                challenge: @Safe.Json(Model.Challenge)
+            }])
+            .then(data => {
+                document.getElementById("DeviceResponse").value = JSON.stringify(data);
+                document.getElementById("registerForm").submit();
+            })
+            .catch(message => {
+                document.getElementById("error-message").classList.remove("d-none");
+                document.getElementById("error-message").innerText = message;
+                document.getElementById("btn-back").innerText = "Retry";
+                document.getElementById("spinner").classList.add("d-none");
+            });
         });
     </script>
 }