diff --git a/hardware/static/js/hw_admin.js b/hardware/static/js/hw_admin.js
index e79da81d8..2f21626db 100644
--- a/hardware/static/js/hw_admin.js
+++ b/hardware/static/js/hw_admin.js
@@ -6,9 +6,10 @@ let hw_admin = ((hw)=>{
     }
     let obj = {}
     let cams = []
+    obj.qrScanner = null
 
     obj.initTypeaheads = ()=>{
-        if($("#qr-result"))
+        if($("#qr-result").length)
             $("#qr-result").typeahead({
                 hint:true,
                 highlight:true,
@@ -33,6 +34,49 @@ let hw_admin = ((hw)=>{
                 }
             });
     }
+
+    obj.destroyQrScanner = ()=>{
+        if (obj.qrScanner) {
+            try {
+                obj.qrScanner.hide()
+            } catch (e) {
+                try {
+                    obj.qrScanner.stop()
+                } catch (err) {
+                    console.warn(err)
+                }
+            }
+            obj.qrScanner = null
+        }
+        $('#veil').remove()
+    }
+
+    obj.initQrScanner = ()=>{
+        let inputElem = document.getElementById('qr-result')
+        let videoElem = document.getElementById('qr-video')
+        let qrButton = document.querySelector('.qr-btn')
+
+        if (!inputElem || !videoElem || !qrButton) return
+        if (inputElem.dataset.qrScannerInitialized === 'true') return
+
+        inputElem.dataset.qrScannerInitialized = 'true'
+        obj.destroyQrScanner()
+
+        obj.qrScanner = new Scanner('qr-video', (content) => {
+            let qrContent = content && content.data ? content.data : content.toString()
+            let input = $('#qr-result')
+            obj.qrScanner.hide()
+            input.val('')
+            input.focus().typeahead('val', qrContent).focus()
+        }, {
+            popup: true,
+            popup_title: 'QR scanner',
+        })
+
+        qrButton.onclick = function () {
+            obj.qrScanner.show()
+        }
+    }
     //-Updates the content
     //-Shows a toast if there's a message
     obj.processResponse = (data)=>{
@@ -42,16 +86,13 @@ let hw_admin = ((hw)=>{
         }
 
         if(data.content){
+            obj.destroyQrScanner()
             $('#hw-container').fadeTo(200, 0, ()=>{
                 $('#hw-container').html(data.content)
                 obj.initListeners()
                 obj.initTypeaheads()
+                obj.initQrScanner()
                 $('#hw-container').fadeTo(200, 1)
-
-                window.document.dispatchEvent(new Event("DOMContentLoaded", {
-                  bubbles: true,
-                  cancelable: true
-                }));
             })
         }
     }
@@ -124,4 +165,5 @@ let hw_admin = ((hw)=>{
 document.addEventListener("DOMContentLoaded", ()=>{
     hw_admin.initListeners()
     hw_admin.initTypeaheads()
+    hw_admin.initQrScanner()
 })
diff --git a/hardware/templates/hardware_admin.html b/hardware/templates/hardware_admin.html
index 4ec49897b..dc7066910 100644
--- a/hardware/templates/hardware_admin.html
+++ b/hardware/templates/hardware_admin.html
@@ -4,8 +4,7 @@
     <link rel="stylesheet" href="{% static 'css/hw.css' %}">
     <script > window.CSRF_TOKEN = "{{ csrf_token }}"</script>
     <script src="{% static 'lib/typeahead.jquery.min.js' %}"></script>
-    <script type="text/javascript" src="https://rawgit.com/schmich/instascan-builds/master/instascan.min.js"></script>
-    <script type="text/javascript" src="{% static 'js/scanner_old.js' %}"></script>
+    {% include 'include/import_qr_scanner.html' %}
     <script type="text/javascript" src="{% static 'js/hw.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/hw_admin.js' %}"></script>
 
diff --git a/hardware/templates/include/hardware_user_email.html b/hardware/templates/include/hardware_user_email.html
index 6d0716411..14fd82010 100644
--- a/hardware/templates/include/hardware_user_email.html
+++ b/hardware/templates/include/hardware_user_email.html
@@ -3,84 +3,7 @@
 <div class='hw-centered' id="form-container-id">
     <label>Hacker:</label>
     <input id="qr-result" class="typeahead" style="color: #0f0f0f" name="email" type="text"/><i id='{{ id }}-qr' class='fa-solid fa-qrcode fa-2x qr-btn'></i>
-	  <div id="popup-scan" style="display: none;">
-      <label class="control-label" for="qr-camara-select" > Select Camera</label>
-      <select id="qr-camara-select" class="form-control">
-        <option value="null">---</option>
-      </select>
-      <video id="qr-video" style="margin-top: 10px; border-radius: 5px"></video>
-      <button id="qr-close-button" class="btn btn-block btn-info">Close</button>
-    </div>
-
-    <script>
-      document.addEventListener("DOMContentLoaded", ()=>{
-            if (!document.getElementById('qr-result')) return
-            function stop() {
-              $('#popup-scan').hide();
-              $('#veil').hide();
-              scanner.stop()
-            }
-            $(document).on('keyup', function(e) {
-              if (e.key === "Escape") stop()
-            });
-            const div = document.createElement('div')
-            div.style = 'display: none;'
-            div.className = 'veil'
-            div.id = 'veil'
-            div.onclick = stop
-
-            document.body.appendChild(div)
-
-            let scanner = new Scanner('qr-video', 'qr-camara-select', (content) => {
-              let input = $('#qr-result')
-              stop()
-              input.val('')
-              input.focus().typeahead('val',content.toString()).focus();
-            })
-            let qrButton = document.getElementById("{{ id }}-qr");
-            qrButton.onclick = function () {
-              $('#popup-scan').show();
-              $('#veil').show();
-              scanner.start()
-            }
-            let closeButton = document.getElementById("qr-close-button");
-            closeButton.onclick = stop
-        })
-    </script>
-{#	<script type="module">#}
-{#        import QrScanner from '/static/lib/qr-scanner.min.js';#}
-{#        QrScanner.WORKER_PATH = '/static/lib/qr-scanner-worker.min.js';#}
-{#        // Video stream#}
-{#        const video = document.getElementById('qr-video');#}
-{#        // Result elements and set function#}
-{#        const camQrResult = document.getElementById('qr-result');#}
-{#        function setResult(result) {#}
-{#            camQrResult.focus();#}
-{#            camQrResult.value = result;#}
-{#            hideQR();#}
-{#            $(".typeahead").typeahead('val', '')#}
-{#            $(".typeahead").focus().typeahead('val',result.toString()).focus();#}
-{#        }#}
-{#        // Scan#}
-{#        const scanner = new QrScanner(video, result => setResult(result));#}
-{#        $("#{{ id }}-qr").click(function () {#}
-{#            let veil = document.createElement("div");#}
-{#            document.body.appendChild(veil);#}
-{#            veil.classList.add('veil');#}
-{#            veil.id = 'veil';#}
-{#            $("#popup-scan").show();#}
-{#            document.getElementById("veil").addEventListener("click", function(){#}
-{#                hideQR();#}
-{#            });#}
-{#          scanner.start();#}
-{#        });#}
-{#        function hideQR() {#}
-{#            $("#popup-scan").hide();#}
-{#            var el = document.getElementById("veil");#}
-{#            el.parentNode.removeChild(el);#}
-{#            scanner.stop();#}
-{#        }#}
-{#    </script>#}
+    <video id="qr-video" style="margin-top: 10px; border-radius: 5px; display: none; width: 100%"></video>
     <div class='hw-centered'>
     {% if item_id %}
     	<button id="hw-user-send-noreq" data-item-id="{{item_id}}" class="btn btn-success">Send</button>