diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt
index 5df13374..01cbb92b 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt
@@ -365,6 +365,7 @@ fun BunkerSingleEventHomeScreen(
                 shouldRunOnAccept = acceptOrReject,
                 appName = appName,
                 type = type,
+                account = account,
                 onAccept = {
                     BunkerRequestUtils.sendResult(
                         context = context,
@@ -428,6 +429,7 @@ fun BunkerSingleEventHomeScreen(
                 shouldRunOnAccept = acceptOrReject,
                 appName = appName,
                 type = type,
+                account = account,
                 onAccept = {
                     val result = bunkerRequest.encryptedData?.result ?: ""
 
@@ -493,6 +495,7 @@ fun BunkerSingleEventHomeScreen(
                 shouldRunOnAccept = acceptOrReject,
                 appName = appName,
                 type = type,
+                account = account,
                 onAccept = {
                     val result = bunkerRequest.encryptedData?.result ?: ""
 
@@ -558,6 +561,7 @@ fun BunkerSingleEventHomeScreen(
                 shouldRunOnAccept = acceptOrReject,
                 appName = appName,
                 type = type,
+                account = account,
                 onAccept = {
                     val result = bunkerRequest.encryptedData?.result ?: ""
 
@@ -707,6 +711,7 @@ fun BunkerSingleEventHomeScreen(
                     shouldRunOnAccept = acceptOrReject,
                     appName = appName,
                     type = type,
+                    account = account,
                     onAccept = {
                         val result =
                             if (bunkerRequest.encryptedData?.result == "Could not decrypt the message") {
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/EncryptDecryptData.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/EncryptDecryptData.kt
index c60cbc9a..eac651b1 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/EncryptDecryptData.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/EncryptDecryptData.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.greenart7c3.nostrsigner.Amber
 import com.greenart7c3.nostrsigner.R
+import com.greenart7c3.nostrsigner.models.Account
 import com.greenart7c3.nostrsigner.models.ClearTextEncryptedDataKind
 import com.greenart7c3.nostrsigner.models.EncryptedDataKind
 import com.greenart7c3.nostrsigner.models.EventEncryptedDataKind
@@ -43,6 +44,7 @@ fun EncryptDecryptData(
     shouldRunOnAccept: Boolean?,
     packageName: String?,
     type: SignerType,
+    account: Account,
     onAccept: (RememberType) -> Unit,
     onReject: (RememberType) -> Unit,
 ) {
@@ -91,7 +93,6 @@ fun EncryptDecryptData(
             text.trim().capitalize(Locale.current),
             fontSize = 18.sp,
         )
-        Spacer(Modifier.size(4.dp))
 
         Card(
             modifier = Modifier
@@ -144,6 +145,8 @@ fun EncryptDecryptData(
                     }
                 } else {
                     if (encryptedData is TagArrayEncryptedDataKind) {
+                        Spacer(Modifier.size(16.dp))
+                        SigningAs(account)
                         EncryptedTagArraySection(
                             modifier = Modifier
                                 .fillMaxWidth()
@@ -168,7 +171,11 @@ fun EncryptDecryptData(
             }
         }
 
-        if (encryptedData !is TagArrayEncryptedDataKind) Spacer(modifier = Modifier.weight(1f))
+        if (encryptedData !is TagArrayEncryptedDataKind) {
+            Spacer(Modifier.size(16.dp))
+            SigningAs(account)
+            Spacer(modifier = Modifier.weight(1f))
+        }
 
         RememberMyChoice(
             shouldRunOnAccept,
@@ -203,6 +210,7 @@ fun BunkerEncryptDecryptData(
     shouldRunOnAccept: Boolean?,
     appName: String,
     type: SignerType,
+    account: Account,
     onAccept: (RememberType) -> Unit,
     onReject: (RememberType) -> Unit,
 ) {
@@ -248,7 +256,6 @@ fun BunkerEncryptDecryptData(
             },
             fontSize = 18.sp,
         )
-        Spacer(Modifier.size(4.dp))
 
         Card(
             modifier = Modifier
@@ -295,6 +302,8 @@ fun BunkerEncryptDecryptData(
                     }
                 } else {
                     if (encryptedData is TagArrayEncryptedDataKind) {
+                        Spacer(Modifier.size(16.dp))
+                        SigningAs(account)
                         EncryptedTagArraySection(
                             modifier = Modifier
                                 .fillMaxWidth()
@@ -319,7 +328,11 @@ fun BunkerEncryptDecryptData(
             }
         }
 
-        if (encryptedData !is TagArrayEncryptedDataKind) Spacer(modifier = Modifier.weight(1f))
+        if (encryptedData !is TagArrayEncryptedDataKind) {
+            Spacer(Modifier.size(16.dp))
+            SigningAs(account)
+            Spacer(modifier = Modifier.weight(1f))
+        }
 
         RememberMyChoice(
             shouldRunOnAccept,
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt
index ea35972e..e1ac6246 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt
@@ -183,6 +183,7 @@ fun IntentSingleEventHomeScreen(
                 shouldRunOnAccept = acceptOrReject,
                 packageName = packageName,
                 type = intentData.type,
+                account = account,
                 onAccept = {
                     val result =
                         if (intentData.encryptedData?.result == "Could not decrypt the message" && (intentData.type == SignerType.DECRYPT_ZAP_EVENT)) {
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SigningAs.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SigningAs.kt
index 44ea93f6..6a8e88c2 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SigningAs.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SigningAs.kt
@@ -3,6 +3,7 @@ package com.greenart7c3.nostrsigner.ui.components
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -33,7 +34,9 @@ import com.greenart7c3.nostrsigner.ui.theme.fromHex
 @Composable
 fun SigningAs(account: Account, modifier: Modifier = Modifier) {
     Column(
-        modifier = modifier.padding(vertical = 8.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(