diff --git a/static/js/index.js b/static/js/index.js
index 6c3711b..392d3a4 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -1,7 +1,5 @@
 /* globals Quasar, Vue, _, VueQrcode, windowMixin, LNbits, LOCALE */
 
-Vue.component(VueQrcode.name, VueQrcode)
-
 const locationPath = [
   window.location.protocol,
   '//',
@@ -21,9 +19,9 @@ const mapPayLink = obj => {
   return obj
 }
 
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   computed: {
     endpoint: function () {
       return `/lnurlp/api/v1/settings?usr=${this.g.user.id}`
@@ -240,7 +238,7 @@ new Vue({
     }
   },
   created() {
-    if (this.g.user.wallets.length) {
+    if (this.g.user.wallets?.length) {
       var getPayLinks = this.getPayLinks
       getPayLinks()
       this.checker = setInterval(() => {
diff --git a/templates/lnurlp/display.html b/templates/lnurlp/display.html
index 7d44037..1aaa82f 100644
--- a/templates/lnurlp/display.html
+++ b/templates/lnurlp/display.html
@@ -6,11 +6,7 @@
         <div class="text-center">
           <a class="text-secondary" href="lightning:{{ lnurl }}">
             <q-responsive :ratio="1" class="q-mx-md">
-              <qrcode
-                value="lightning:{{ lnurl }}"
-                :options="{width: 800}"
-                class="rounded-borders"
-              ></qrcode>
+              <lnbits-qrcode value="lightning:{{ lnurl }}"></lnbits-qrcode>
             </q-responsive>
           </a>
         </div>
@@ -44,11 +40,9 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
     el: '#vue',
-    mixins: [windowMixin]
+    mixins: [window.windowMixin]
   })
 </script>
 {% endblock %}
diff --git a/templates/lnurlp/index.html b/templates/lnurlp/index.html
index e35395f..1460d75 100644
--- a/templates/lnurlp/index.html
+++ b/templates/lnurlp/index.html
@@ -359,12 +359,8 @@
     <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
       {% raw %}
       <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode
-          :value="'lightning:' + qrCodeDialog.data.lnurl"
-          :options="{width: 800}"
-          class="rounded-borders"
-        >
-        </qrcode>
+        <lnbits-qrcode :value="'lightning:' + qrCodeDialog.data.lnurl">
+        </lnbits-qrcode>
       </q-responsive>
       <p style="word-break: break-all">
         <strong>ID:</strong> {{ qrCodeDialog.data.id }}<br />
diff --git a/templates/lnurlp/print_qr.html b/templates/lnurlp/print_qr.html
index 5f3129d..efb92b4 100644
--- a/templates/lnurlp/print_qr.html
+++ b/templates/lnurlp/print_qr.html
@@ -1,7 +1,7 @@
 {% extends "print.html" %} {% block page %}
 <div class="row justify-center">
   <div class="qr">
-    <qrcode value="lightning:{{ lnurl }}" :options="{width}"></qrcode>
+    <lnbits-qrcode value="lightning:{{ lnurl }}"></lnbits-qrcode>
   </div>
 </div>
 {% endblock %} {% block styles %}
@@ -12,9 +12,7 @@
 </style>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
     el: '#vue',
     created: function () {
       window.print()