diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index decf2b91a..c3ae76869 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -949,7 +949,9 @@
     },
     created: async function () {
       console.log(this.admin)
-      await this.getThemes()
+      if(this.admin == "True"){
+          await this.getThemes()
+      }
       await this.getCharges()
       await this.getWalletConfig()
       await this.getWalletLinks()
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 5f0e72cef..d9defa2f3 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -143,7 +143,7 @@ async def api_charge_balance(charge_id):
             try:
                 r = await client.post(
                     charge.webhook,
-                    json=compact_charge(charge),
+                    json=public_charge(charge),
                     timeout=40,
                 )
             except AssertionError: