diff --git a/Hushian.Application/Services/ChatService.cs b/Hushian.Application/Services/ChatService.cs
index 6349b82..9ed187c 100644
--- a/Hushian.Application/Services/ChatService.cs
+++ b/Hushian.Application/Services/ChatService.cs
@@ -292,7 +292,7 @@ namespace Hushian.Application.Services
 
                             if (modelA.Type == ConversationType.EU) user = modelA.ExperID.Value.ToString();
 
-                            else if (modelA.Type == ConversationType.CU) user = modelA.conversation.CompanyID.ToString();
+                            else if (modelA.Type == ConversationType.CU) user ="C"+ modelA.conversation.CompanyID.ToString();
 
                             await WriteInHubFromUser(Response.Value, user);
 
@@ -390,7 +390,7 @@ namespace Hushian.Application.Services
                             string user = "";
                             if (item.Type == ConversationType.EU) user = item.ExperID.Value.ToString();
 
-                            else if (item.Type == ConversationType.CU) user = item.conversation.CompanyID.ToString();
+                            else if (item.Type == ConversationType.CU) user ="C"+ item.conversation.CompanyID.ToString();
 
                             else if (item.Type == ConversationType.UE) user =  item.conversation.UserID.ToString();
 
diff --git a/Hushian.Application/Services/ExMethod.cs b/Hushian.Application/Services/ExMethod.cs
index 00dfee9..197cbf9 100644
--- a/Hushian.Application/Services/ExMethod.cs
+++ b/Hushian.Application/Services/ExMethod.cs
@@ -29,8 +29,8 @@ namespace Hushian.Application.Services
             {
                 new Claim(JwtRegisteredClaimNames.Sub,
                 //Role=="User" ? "U"+userId.ToString() 
-                //:Role=="Company" ? "C"+userId.ToString()
-                //:
+                Role=="Company" ? "C"+userId.ToString()
+                :
                 userId.ToString()),
                 new Claim(ClaimTypes.NameIdentifier, UserName),
                 new Claim(CustomClaimTypes.Uid,userId.ToString()),
diff --git a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
index 8ffec98..0916534 100644
--- a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
+++ b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
@@ -9,7 +9,7 @@
 @using System.Threading;
 @if(CompanyInfo!=null)
 {
-<PageTitle>گفتگو با @CompanyInfo?.FullName</PageTitle>
+    <PageTitle>گفتگو با @CompanyInfo?.FullName</PageTitle>
 }
 @inject NavigationManager NavigationManager
 @inject ChatService ChatService
@@ -622,6 +622,7 @@
     async Task NewChat()
     {
         LastOpenChat = null;
+        GroupID = null;
     }
     async Task CloseChat()
     {