diff --git a/app/src/main/java/com/rosetta/messenger/ui/auth/UnlockScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/auth/UnlockScreen.kt
index 8ca6aba..8e3551c 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/auth/UnlockScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/auth/UnlockScreen.kt
@@ -248,7 +248,7 @@ fun UnlockScreen(
                         ) {
                             // Avatar
                             if (selectedAccount != null) {
-                                val avatarColors = getAvatarColor(selectedAccount!!.name, isDarkTheme)
+                                val avatarColors = getAvatarColor(selectedAccount!!.publicKey, isDarkTheme)
                                 Box(
                                     modifier = Modifier
                                         .size(48.dp)
@@ -398,7 +398,7 @@ fun UnlockScreen(
                                             verticalAlignment = Alignment.CenterVertically
                                         ) {
                                             // Avatar
-                                            val avatarColors = getAvatarColor(account.name, isDarkTheme)
+                                            val avatarColors = getAvatarColor(account.publicKey, isDarkTheme)
                                             Box(
                                                 modifier = Modifier
                                                     .size(40.dp)
diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
index 31f7b80..d4cc516 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
@@ -342,7 +342,7 @@ fun ChatsListScreen(
                             verticalAlignment = Alignment.Top
                         ) {
                             // Avatar with public key
-                            val avatarColors = getAvatarColor(accountName, isDarkTheme)
+                            val avatarColors = getAvatarColor(accountPublicKey, isDarkTheme)
                             Box(
                                 modifier = Modifier
                                     .size(64.dp)
@@ -888,7 +888,7 @@ fun ChatItem(
     val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF666666)
     val dividerColor = if (isDarkTheme) Color(0xFF3A3A3A) else Color(0xFFE8E8E8)
     
-    val avatarColors = getAvatarColor(chat.name, isDarkTheme)
+    val avatarColors = getAvatarColor(chat.publicKey, isDarkTheme)
     val avatarText = getAvatarText(chat.publicKey)
     
     Column {