diff --git a/assets/controllers/pages/label_download_btn_controller.js b/assets/controllers/pages/label_download_btn_controller.js
new file mode 100644
index 00000000..dc0f52ec
--- /dev/null
+++ b/assets/controllers/pages/label_download_btn_controller.js
@@ -0,0 +1,8 @@
+import {Controller} from "@hotwired/stimulus";
+
+export default class extends Controller
+{
+    download(event) {
+        this.element.href = document.getElementById('pdf_preview').data
+    }
+}
\ No newline at end of file
diff --git a/assets/controllers/pages/u2f_register_controller.js b/assets/controllers/pages/u2f_register_controller.js
new file mode 100644
index 00000000..d807a3aa
--- /dev/null
+++ b/assets/controllers/pages/u2f_register_controller.js
@@ -0,0 +1,10 @@
+import {Controller} from "@hotwired/stimulus";
+
+export default class extends Controller
+{
+    connect() {
+        this.element.onclick = function() {
+            window.u2fauth.register();
+        }
+    }
+}
diff --git a/templates/LabelSystem/dialog.html.twig b/templates/LabelSystem/dialog.html.twig
index ed7045ee..336118f9 100644
--- a/templates/LabelSystem/dialog.html.twig
+++ b/templates/LabelSystem/dialog.html.twig
@@ -99,7 +99,7 @@
     {% if pdf_data %}
         <div class="row">
             <div class="col-sm-9 offset-sm-3">
-                <a data-turbo="false" class="btn btn-secondary" href="#" onclick="this.href = document.getElementById('pdf_preview').data" download="{{ filename ?? '' }}">
+                <a data-turbo="false" class="btn btn-secondary" href="#" {{ stimulus_controller('pages/label_download_btn')}} {{ stimulus_action('pages/label_download_btn', 'download')}} download="{{ filename ?? '' }}">
                     {% trans %}label_generator.download{% endtrans %}
                 </a>
             </div>
diff --git a/templates/security/U2F/u2f_register.html.twig b/templates/security/U2F/u2f_register.html.twig
index 324eb106..8ef65db7 100644
--- a/templates/security/U2F/u2f_register.html.twig
+++ b/templates/security/U2F/u2f_register.html.twig
@@ -16,7 +16,7 @@
                 <input type="text" class="form-control " name="keyName" id="keyName" placeholder="{{ 'r_u2f_two_factor.name'|trans }}"/>
             </div>
             <div class="col-3">
-                <button type="button" class="btn btn-success" onclick="u2fauth.register()">{% trans %}tfa_u2f.add_key.add_button{% endtrans %}</button>
+                <button type="button" class="btn btn-success" {{ stimulus_controller('pages/u2f_register') }}>{% trans %}tfa_u2f.add_key.add_button{% endtrans %}</button>
             </div>
         </div>
         <div id="u2fpressbutton" style="display: none;" class="text-center h4">{{ 'r_u2f_two_factor.pressbutton'|trans }}</div>