diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
index 57867a95..d5056eaa 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.greenart7c3.nostrsigner.MainViewModel
@@ -121,23 +120,26 @@ fun AccountScreen(
 
 @Composable
 private fun DisplayErrorMessages(accountViewModel: AccountStateViewModel) {
-    val context = LocalContext.current
-    val openDialogMsg = accountViewModel.toasts.collectAsStateWithLifecycle(null)
+    val openDialogMsg = accountViewModel.toasts.collectAsState(null)
 
     openDialogMsg.value?.let { obj ->
         when (obj) {
             is ResourceToastMsg ->
                 if (obj.params != null) {
+                    val title = stringResource(obj.titleResId)
+                    val content = stringResource(obj.resourceId, *obj.params)
                     InformationDialog(
-                        context.getString(obj.titleResId),
-                        context.getString(obj.resourceId, *obj.params),
+                        title,
+                        content,
                     ) {
                         accountViewModel.clearToasts()
                     }
                 } else {
+                    val title = stringResource(obj.titleResId)
+                    val content = stringResource(obj.resourceId)
                     InformationDialog(
-                        context.getString(obj.titleResId),
-                        context.getString(obj.resourceId),
+                        title,
+                        content,
                     ) {
                         accountViewModel.clearToasts()
                     }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/NewApplicationScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/NewApplicationScreen.kt
index ee3a1136..fb2e3127 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/NewApplicationScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/NewApplicationScreen.kt
@@ -6,11 +6,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalContext
@@ -30,6 +28,7 @@ import com.greenart7c3.nostrsigner.models.Account
 import com.greenart7c3.nostrsigner.service.IntentUtils
 import com.greenart7c3.nostrsigner.ui.components.AmberButton
 import com.greenart7c3.nostrsigner.ui.navigation.Route
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
@@ -39,22 +38,39 @@ fun NewApplicationScreen(
     account: Account,
     navController: NavController,
 ) {
-    var dialogOpen by remember { mutableStateOf(false) }
+    val dialogOpen = remember { mutableStateOf(false) }
     val clipboardManager = LocalClipboard.current
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
-
-    if (dialogOpen) {
+    val title = stringResource(R.string.warning)
+    val message = stringResource(R.string.invalid_nostr_connect_uri)
+    if (dialogOpen.value) {
         SimpleQrCodeScanner {
-            dialogOpen = false
-            if (!it.isNullOrEmpty()) {
+            dialogOpen.value = false
+
+            if (it.isNullOrBlank()) {
+                accountStateViewModel.toast(
+                    title,
+                    message,
+                )
+                return@SimpleQrCodeScanner
+            }
+
+            if (!it.startsWith("nostrconnect://")) {
+                accountStateViewModel.toast(
+                    title,
+                    message,
+                )
+                return@SimpleQrCodeScanner
+            }
+
+            Amber.instance.applicationIOScope.launch(Dispatchers.IO) {
                 val intent = Intent(Intent.ACTION_VIEW)
                 intent.data = it.toUri()
                 intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                 intent.putExtra("closeApplication", false)
                 intent.`package` = context.packageName
-                Amber.instance.getMainActivity()?.startActivity(intent)
-                accountStateViewModel.switchUser(account.npub, Route.IncomingRequest.route)
+                IntentUtils.getIntentData(context, intent, null, Route.IncomingRequest.route, account)
             }
         }
     }
@@ -75,23 +91,23 @@ fun NewApplicationScreen(
                     val clipboardText = clipboardManager.getClipEntry()?.clipData?.getItemAt(0)
                     if (clipboardText == null) {
                         accountStateViewModel.toast(
-                            context.getString(R.string.warning),
-                            context.getString(R.string.invalid_nostr_connect_uri),
+                            title,
+                            message,
                         )
                         return@launch
                     }
 
                     if (clipboardText.text.isBlank()) {
                         accountStateViewModel.toast(
-                            context.getString(R.string.warning),
-                            context.getString(R.string.invalid_nostr_connect_uri),
+                            title,
+                            message,
                         )
                         return@launch
                     }
                     if (!clipboardText.text.startsWith("nostrconnect://")) {
                         accountStateViewModel.toast(
-                            context.getString(R.string.warning),
-                            context.getString(R.string.invalid_nostr_connect_uri),
+                            title,
+                            message,
                         )
                         return@launch
                     }
@@ -118,7 +134,7 @@ fun NewApplicationScreen(
 
         AmberButton(
             onClick = {
-                dialogOpen = true
+                dialogOpen.value = true
             },
             text = stringResource(R.string.scan_qr_code),
         )