diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py
index d39cd7b43..40d36e177 100644
--- a/lnbits/extensions/lnaddress/lnurl.py
+++ b/lnbits/extensions/lnaddress/lnurl.py
@@ -29,8 +29,7 @@ async def lnurl_response(username: str, domain: str, request: Request):
         return LnurlErrorResponse(reason="Address has expired.").dict()
 
     resp = LnurlPayResponse(
-        # callback=request.url_for("lnaddress.lnurl_callback", address_id=address.id),
-        callback=f"https://fastbits.lnto.me/lnaddress/lnurl/cb/{address.id}",
+        callback=request.url_for("lnaddress.lnurl_callback", address_id=address.id),
         min_sendable=1000,
         max_sendable=1000000000,
         metadata=await address.lnurlpay_metadata(),
diff --git a/lnbits/extensions/lnaddress/models.py b/lnbits/extensions/lnaddress/models.py
index 7922b598d..268831b38 100644
--- a/lnbits/extensions/lnaddress/models.py
+++ b/lnbits/extensions/lnaddress/models.py
@@ -51,7 +51,7 @@ class Addresses(BaseModel):
 
     async def lnurlpay_metadata(self) -> LnurlPayMetadata:
         text = f"Payment to {self.username}"
-        identifier = f"{self.username}@lnto.name"
+        identifier = f"{self.username}"
         metadata = [["text/plain", text], ["text/identifier", identifier]]
 
-        return LnurlPayMetadata(json.dumps(metadata))
+        return LnurlPayMetadata(metadata)