diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
index 25978ae4e..5cc43be56 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
@@ -71,7 +71,7 @@ fun CashuPreview(cashutoken: String, accountViewModel: AccountViewModel) {
                     .padding(vertical = 10.dp),
                 onClick = {
                     runCatching {
-                        val url = "https://redeem.cashu.me?token=$cashutoken&lightning=$lnaddress"
+                        val url = "https://redeem.cashu.me?token=$cashutoken&lightning=$lnaddress&autopay=true"
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
                         startActivity(context, intent, null)
                     }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index 8dd75aff5..bc43fefef 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -284,7 +284,7 @@ private fun RenderWord(
             WordType.INVOICE
         } else if (word.startsWith("lnurl", true)) {
             WordType.WITHDRAW
-        } else if (word.startsWith("cashu", true) && word.endsWith("==", true)) {
+        } else if (word.startsWith("cashuA", true)) {
             WordType.CASHU
         } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
             WordType.EMAIL