diff --git a/app/src/main/java/com/rosetta/messenger/MainActivity.kt b/app/src/main/java/com/rosetta/messenger/MainActivity.kt
index 4af9b8b..cdcdade 100644
--- a/app/src/main/java/com/rosetta/messenger/MainActivity.kt
+++ b/app/src/main/java/com/rosetta/messenger/MainActivity.kt
@@ -161,6 +161,7 @@ class MainActivity : ComponentActivity() {
                             AccountInfo(
                                     id = account.publicKey,
                                     name = displayName,
+                                    username = account.username,
                                     initials = initials,
                                     publicKey = account.publicKey
                             )
@@ -270,6 +271,7 @@ class MainActivity : ComponentActivity() {
                                                             AccountInfo(
                                                                     id = acc.publicKey,
                                                                     name = displayName,
+                                                                    username = acc.username,
                                                                     initials = initials,
                                                                     publicKey = acc.publicKey
                                                             )
@@ -333,6 +335,7 @@ class MainActivity : ComponentActivity() {
                                                         AccountInfo(
                                                                 id = acc.publicKey,
                                                                 name = displayName,
+                                                                username = acc.username,
                                                                 initials = initials,
                                                                 publicKey = acc.publicKey
                                                         )
diff --git a/app/src/main/java/com/rosetta/messenger/ui/auth/SelectAccountScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/auth/SelectAccountScreen.kt
index da0d91d..dbbe4cb 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/auth/SelectAccountScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/auth/SelectAccountScreen.kt
@@ -26,6 +26,7 @@ import com.rosetta.messenger.ui.onboarding.PrimaryBlue
 data class AccountInfo(
     val id: String,
     val name: String,
+    val username: String,
     val initials: String,
     val publicKey: String
 )
@@ -318,7 +319,7 @@ private fun AccountListItem(
                     )
                     Spacer(modifier = Modifier.height(4.dp))
                     Text(
-                        text = "${account.publicKey.take(8)}...${account.publicKey.takeLast(6)}",
+                        text = if (account.username.isNotEmpty()) "@${account.username}" else "${account.publicKey.take(8)}...${account.publicKey.takeLast(6)}",
                         fontSize = 13.sp,
                         color = secondaryTextColor,
                         maxLines = 1,