diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataScreen.kt
index ae124dfaf4..c83719af68 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataScreen.kt
@@ -271,6 +271,38 @@ fun NewUserMetadataScreen(
                     singleLine = true,
                 )
 
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.lightning_address)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnAddress.value,
+                    onValueChange = { postViewModel.lnAddress.value = it },
+                    placeholder = {
+                        Text(
+                            text = "me@mylightningnode.com",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.lnurl)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnURL.value,
+                    onValueChange = { postViewModel.lnURL.value = it },
+                    placeholder = {
+                        Text(
+                            text = "LNURL1…",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
                 // -- Social Proofs --
                 ExpandableSection(
                     title = stringRes(R.string.social_proof),
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt
index 80db28a2dc..c5ea8056fb 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt
@@ -57,6 +57,8 @@ class NewUserMetadataViewModel : ViewModel() {
     val website = mutableStateOf("")
     val pronouns = mutableStateOf("")
     val nip05 = mutableStateOf("")
+    val lnAddress = mutableStateOf("")
+    val lnURL = mutableStateOf("")
 
     val twitter = mutableStateOf("")
     val github = mutableStateOf("")
@@ -80,6 +82,8 @@ class NewUserMetadataViewModel : ViewModel() {
             website.value = it.info.website ?: ""
             pronouns.value = it.info.pronouns ?: ""
             nip05.value = it.info.nip05 ?: ""
+            lnAddress.value = it.info.lud16 ?: ""
+            lnURL.value = it.info.lud06 ?: ""
         }
 
         twitter.value = ""
@@ -117,6 +121,8 @@ class NewUserMetadataViewModel : ViewModel() {
                 pronouns = pronouns.value,
                 about = about.value,
                 nip05 = nip05.value,
+                lnAddress = lnAddress.value,
+                lnURL = lnURL.value,
             )
 
         val identities =
@@ -140,6 +146,8 @@ class NewUserMetadataViewModel : ViewModel() {
         banner.value = ""
         website.value = ""
         nip05.value = ""
+        lnAddress.value = ""
+        lnURL.value = ""
         twitter.value = ""
         github.value = ""
         mastodon.value = ""