diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index fab0406f2..e707dc008 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -17,15 +17,6 @@ from ..watchonly.crud import get_watch_wallet, get_fresh_address, get_mempool
 async def create_charge(
     user: str,
     data: CreateCharge
-    # user: str,
-    # description: str = None,
-    # onchainwallet: Optional[str] = None,
-    # lnbitswallet: Optional[str] = None,
-    # webhook: Optional[str] = None,
-    # completelink: Optional[str] = None,
-    # completelinktext: Optional[str] = "Back to Merchant",
-    # time: Optional[int] = None,
-    # amount: Optional[int] = None,
 ) -> Charges:
     charge_id = urlsafe_short_hash()
     if data.onchainwallet:
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 8730809b0..4cf3efadd 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -1,4 +1,5 @@
 from sqlite3 import Row
+from typing import Optional
 from fastapi.param_functions import Query
 from pydantic import BaseModel
 import time
@@ -16,15 +17,15 @@ class CreateCharge(BaseModel):
 class Charges(BaseModel):
     id: str
     user: str
-    description: str
-    onchainwallet: str
-    onchainaddress: str
-    lnbitswallet: str
+    description: Optional[str]
+    onchainwallet: Optional[str]
+    onchainaddress: Optional[str]
+    lnbitswallet: Optional[str]
     payment_request: str
     payment_hash: str
-    webhook: str
-    completelink: str
-    completelinktext: str
+    webhook: Optional[str]
+    completelink: Optional[str]
+    completelinktext: Optional[str] = "Back to Merchant"
     time: int
     amount: int
     balance: int
diff --git a/lnbits/extensions/satspay/templates/satspay/_api_docs.html b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
index 1a7ba5e41..af95cbf2c 100644
--- a/lnbits/extensions/satspay/templates/satspay/_api_docs.html
+++ b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
@@ -37,7 +37,7 @@
             "description": <string>, "webhook":<string>, "time":
             <integer>, "amount": <integer>, "lnbitswallet":
             <string, lnbits_wallet_id>}' -H "Content-type:
-            application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+            application/json" -H "X-Api-Key: {{user.wallets[0].adminkey }}"
           </code>
         </q-card-section>
       </q-card>
@@ -65,7 +65,7 @@
             "description": &lt;string&gt;, "webhook":&lt;string&gt;, "time":
             &lt;integer&gt;, "amount": &lt;integer&gt;, "lnbitswallet":
             &lt;string, lnbits_wallet_id&gt;}' -H "Content-type:
-            application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+            application/json" -H "X-Api-Key: {{user.wallets[0].adminkey }}"
           </code>
         </q-card-section>
       </q-card>
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index b3386074e..5b0282b61 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -207,7 +207,7 @@
 </div>
 
 {% endblock %} {% block scripts %}
-<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
+
 <style>
   .theCard {
     width: 360px;
@@ -302,6 +302,7 @@
       }
     },
     created: function () {
+      console.log('{{ charge.onchainaddress }}' == 'None')
       if ('{{ charge.lnbitswallet }}' == 'None') {
         this.lnbtc = false
         this.onbtc = true
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index f3566c7c4..d941e90b7 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -280,7 +280,8 @@
   </q-dialog>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
+<!-- lnbits/static/vendor
+<script src="/vendor/vue-qrcode@1.0.2/vue-qrcode.min.js"></script> -->
 <style></style>
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
@@ -542,6 +543,7 @@
       }
     },
     created: function () {
+      console.log(this.g.user)
       var self = this
       var getCharges = this.getCharges
       getCharges()
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index c1be381c4..020b58977 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -1,6 +1,7 @@
 from fastapi.param_functions import Depends
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
+from starlette.requests import Request
 from lnbits.core.models import User
 from lnbits.core.crud import get_wallet
 from lnbits.decorators import check_user_exists
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 85590e5e0..0bfe5f044 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -33,10 +33,10 @@ from .crud import (
 
 async def api_charge_create_or_update(data: CreateCharge, wallet: WalletTypeInfo = Depends(get_key_type), charge_id=None):
     if not charge_id:
-        charge = await create_charge(user=wallet.wallet.user, **data)
+        charge = await create_charge(user=wallet.wallet.user, data=data)
         return charge.dict()
     else:
-        charge = await update_charge(charge_id=charge_id, **data)
+        charge = await update_charge(charge_id=charge_id, data=data)
         return charge.dict()