diff --git a/shell/agents/Microsoft.Azure.Agent/ChatSession.cs b/shell/agents/Microsoft.Azure.Agent/ChatSession.cs
index 82b94cc4..e07ea8e1 100644
--- a/shell/agents/Microsoft.Azure.Agent/ChatSession.cs
+++ b/shell/agents/Microsoft.Azure.Agent/ChatSession.cs
@@ -56,9 +56,9 @@ internal ChatSession(HttpClient httpClient)
             ["getformstate"] = true,
             ["notificationcopilotbuttonallerror"] = false,
             ["chitchatprompt"] = true,
+            ["azurepluginstore"] = true,
             // TODO: the streaming is slow and not sending chunks, very clumsy for now.
             // ["streamresponse"] = true,
-            // ["azurepluginstore"] = true,
         };
     }
 
@@ -239,6 +239,11 @@ private HttpRequestMessage PrepareForChat(string input)
                     content = new {
                         flights = _flights
                     }
+                },
+                new {
+                    contentType = Utils.JsonContentType,
+                    name = "azurecopilot/authorization",
+                    content = $"Bearer {_accessToken.Token}"
                 }
             },
         };
diff --git a/shell/agents/Microsoft.Azure.Agent/Schema.cs b/shell/agents/Microsoft.Azure.Agent/Schema.cs
index 15a2da3d..53d7ccf0 100644
--- a/shell/agents/Microsoft.Azure.Agent/Schema.cs
+++ b/shell/agents/Microsoft.Azure.Agent/Schema.cs
@@ -120,7 +120,7 @@ internal class CopilotActivity
 {
     public const string ConversationStateName = "azurecopilot/conversationstate";
     public const string SuggestedResponseName = "azurecopilot/suggesteduserresponses";
-    public const string CLIHandlerTopic = "CLIHandler";
+    public const string CLIHandlerTopic = "generate_azure_cli_scripts";
 
     public string Type { get; set; }
     public string Id { get; set; }