MS

Controls.ChatControl/ChatControl.vb

@@ -198,8 +198,15 @@ Public Class ChatControl
                         oConvUser = $"No Identification for UserID '{oROW.Item("USER_ID")}'"
                     End If
                 Else
-                    ListBoxUserMention.Items.Add("@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@")))
-                    AssistListBox.Items.Add("@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@")))
+                    Dim oToUser As String
+                    If oConvUser.ToString.Contains("@") Then
+                        oToUser = "@" & oConvUser.ToString.Substring(0, oConvUser.ToString.IndexOf("@"))
+                    Else
+                        oToUser = "@" & oConvUser.ToString
+                    End If
+
+                    ListBoxUserMention.Items.Add(oToUser)
+                    AssistListBox.Items.Add(oToUser)
 
                 End If
                 Dim oToolStripItem As ToolStripMenuItem = New ToolStripMenuItem(oConvUser.ToString)