diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06bc2815..bc995c1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ### Added
 
-- The chat view style now updates to match the theme of the editor on theme change. [pull/85](https://github.com/sourcegraph/cody-vs/pull/85)
+- Chat view style now matches the editor theme on theme changes. [pull/85](https://github.com/sourcegraph/cody-vs/pull/85)
+- Added browser-based authentication support. [pull/84](https://github.com/sourcegraph/cody-vs/pull/84)
 
 ### Changed
 
diff --git a/src/Cody.AgentTester/Cody.AgentTester.csproj b/src/Cody.AgentTester/Cody.AgentTester.csproj
index ef5ca956..cb9b39b5 100644
--- a/src/Cody.AgentTester/Cody.AgentTester.csproj
+++ b/src/Cody.AgentTester/Cody.AgentTester.csproj
@@ -50,6 +50,7 @@
   <ItemGroup>
     <Compile Include="AssemblyLoader.cs" />
     <Compile Include="ConsoleLogger.cs" />
+    <Compile Include="FakeSecretStorageProvider.cs" />
     <Compile Include="FakeServiceProvider.cs" />
     <Compile Include="MemorySettingsProvider.cs" />
     <Compile Include="Program.cs" />
diff --git a/src/Cody.AgentTester/FakeSecretStorageProvider.cs b/src/Cody.AgentTester/FakeSecretStorageProvider.cs
new file mode 100644
index 00000000..5e9c364e
--- /dev/null
+++ b/src/Cody.AgentTester/FakeSecretStorageProvider.cs
@@ -0,0 +1,81 @@
+using Microsoft.VisualStudio.Shell.Connected.CredentialStorage;
+using System;
+using System.Collections.Generic;
+
+namespace Cody.AgentTester
+{
+    public class FakeSecretStorageProvider : IVsCredentialStorageService
+    {
+        private Dictionary<IVsCredentialKey, IVsCredential> _credentials = new Dictionary<IVsCredentialKey, IVsCredential>();
+
+        public IVsCredential Add(IVsCredentialKey key, string value)
+        {
+            var credential = new FakeCredential(value);
+            _credentials[key] = credential;
+            return credential;
+        }
+        public IVsCredential Retrieve(IVsCredentialKey key)
+        {
+            return _credentials[key];
+        }
+        public IEnumerable<IVsCredential> RetrieveAll(string key)
+        {
+            throw new NotImplementedException();
+        }
+        public bool Remove(IVsCredentialKey key)
+        {
+            return _credentials.Remove(key);
+        }
+        public IVsCredentialKey CreateCredentialKey(string featureName, string resource, string userName, string type)
+        {
+            return new FakeCredentialKey(featureName, resource, userName, type);
+        }
+
+        private class FakeCredentialKey : IVsCredentialKey
+        {
+            public string FeatureName { get; set; }
+            public string UserName { get; set; }
+            public string Type { get; set; }
+            public string Resource { get; set; }
+
+            public FakeCredentialKey(string featureName, string resource, string userName, string type)
+            {
+                FeatureName = featureName;
+                UserName = userName;
+                Type = type;
+                Resource = resource;
+            }
+        }
+
+        private class FakeCredential : IVsCredential
+        {
+            public string FeatureName { get; set; }
+            public string UserName { get; set; }
+            public string Type { get; set; }
+            public string Resource { get; set; }
+
+            public string TokenValue { get; set; }
+
+            public bool RefreshTokenValue()
+            {
+                return true;
+            }
+            public void SetTokenValue(string tokenValue)
+            {
+                TokenValue = tokenValue;
+            }
+            public string GetProperty(string name)
+            {
+                return name;
+            }
+            public bool SetProperty(string name, string value)
+            {
+                return true;
+            }
+            public FakeCredential(string tokenValue)
+            {
+                TokenValue = tokenValue;
+            }
+        }
+    }
+}
diff --git a/src/Cody.AgentTester/Program.cs b/src/Cody.AgentTester/Program.cs
index dbdf313d..3ca68f28 100644
--- a/src/Cody.AgentTester/Program.cs
+++ b/src/Cody.AgentTester/Program.cs
@@ -30,11 +30,12 @@ static async Task Main(string[] args)
             var portNumber = int.TryParse(devPort, out int port) ? port : 3113;
 
             var logger = new Logger();
-            var settingsService = new UserSettingsService(new MemorySettingsProvider(), logger);
+            var secretStorageService = new SecretStorageService(new FakeSecretStorageProvider());
+            var settingsService = new UserSettingsService(new MemorySettingsProvider(), secretStorageService, logger);
             var editorService = new FileService(new FakeServiceProvider(), logger);
             var options = new AgentClientOptions
             {
-                CallbackHandlers = new List<object> { new NotificationHandlers(settingsService, logger, editorService) },
+                CallbackHandlers = new List<object> { new NotificationHandlers(settingsService, logger, editorService, secretStorageService) },
                 AgentDirectory = "../../../Cody.VisualStudio/Agent",
                 RestartAgentOnFailure = true,
                 Debug = true,
@@ -63,6 +64,7 @@ private static async Task Initialize()
                 WorkspaceRootUri = Directory.GetCurrentDirectory().ToString(),
                 Capabilities = new ClientCapabilities
                 {
+                    Authentication = Capability.Enabled,
                     Edit = Capability.Enabled,
                     EditWorkspace = Capability.None,
                     CodeLenses = Capability.None,
@@ -78,6 +80,7 @@ private static async Task Initialize()
                     },
                     WebviewMessages = "string-encoded",
                     GlobalState = "stateless",
+                    Secrets = "stateless",
                 },
                 ExtensionConfiguration = new ExtensionConfiguration
                 {
diff --git a/src/Cody.Core/Agent/InitializeCallback.cs b/src/Cody.Core/Agent/InitializeCallback.cs
index 14c6ff6b..2d2a3312 100644
--- a/src/Cody.Core/Agent/InitializeCallback.cs
+++ b/src/Cody.Core/Agent/InitializeCallback.cs
@@ -43,6 +43,7 @@ public async Task Initialize(IAgentService client)
                 WorkspaceRootUri = solutionService.GetSolutionDirectory(),
                 Capabilities = new ClientCapabilities
                 {
+                    Authentication = Capability.Enabled,
                     Completions = "none",
                     Edit = Capability.None,
                     EditWorkspace = Capability.None,
@@ -60,6 +61,7 @@ public async Task Initialize(IAgentService client)
                     },
                     WebviewMessages = "string-encoded",
                     GlobalState = "server-managed",
+                    Secrets = "client-managed",
                 },
                 ExtensionConfiguration = GetConfiguration()
             };
diff --git a/src/Cody.Core/Agent/NotificationHandlers.cs b/src/Cody.Core/Agent/NotificationHandlers.cs
index 0c1a52a8..23967097 100644
--- a/src/Cody.Core/Agent/NotificationHandlers.cs
+++ b/src/Cody.Core/Agent/NotificationHandlers.cs
@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Threading.Tasks;
+using Cody.Core.Infrastructure;
 
 namespace Cody.Core.Agent
 {
@@ -13,6 +14,7 @@ public class NotificationHandlers : INotificationHandler
         private readonly WebviewMessageHandler _messageFilter;
         private readonly IUserSettingsService _settingsService;
         private readonly IFileService _fileService;
+        private readonly ISecretStorageService _secretStorage;
         private readonly ILog _logger;
 
         public IAgentService agentClient;
@@ -27,10 +29,11 @@ public class NotificationHandlers : INotificationHandler
 
         public event EventHandler<AgentResponseEvent> OnPostMessageEvent;
 
-        public NotificationHandlers(IUserSettingsService settingsService, ILog logger, IFileService fileService)
+        public NotificationHandlers(IUserSettingsService settingsService, ILog logger, IFileService fileService, ISecretStorageService secretStorage)
         {
             _settingsService = settingsService;
             _fileService = fileService;
+            _secretStorage = secretStorage;
             _logger = logger;
             _messageFilter = new WebviewMessageHandler(settingsService, fileService, () => OnOptionsPageShowRequest?.Invoke(this, EventArgs.Empty));
         }
@@ -188,5 +191,26 @@ public Task<string> ShowSaveDialog(SaveDialogOptionsParams paramValues)
         {
             return Task.FromResult("Not Yet Implemented");
         }
+
+        [AgentCallback("secrets/get")]
+        public Task<string> SecretGet(string key)
+        {
+            _logger.Debug(key, $@"SecretGet - {key}");
+            return Task.FromResult(_secretStorage.Get(key));
+        }
+
+        [AgentCallback("secrets/store")]
+        public void SecretStore(string key, string value)
+        {
+            _logger.Debug(key, $@"SecretStore - {key}");
+            _secretStorage.Set(key, value);
+        }
+
+        [AgentCallback("secrets/delete")]
+        public void SecretDelete(string key)
+        {
+            _logger.Debug(key, $@"SecretDelete - {key}");
+            _secretStorage.Delete(key);
+        }
     }
 }
diff --git a/src/Cody.Core/Agent/Protocol/ClientCapabilities.cs b/src/Cody.Core/Agent/Protocol/ClientCapabilities.cs
index 1589c71d..cd81f491 100644
--- a/src/Cody.Core/Agent/Protocol/ClientCapabilities.cs
+++ b/src/Cody.Core/Agent/Protocol/ClientCapabilities.cs
@@ -18,6 +18,8 @@ public class ClientCapabilities
         public string Webview { get; set; } // 'agentic' | 'native'
         public WebviewCapabilities WebviewNativeConfig { get; set; }
         public string GlobalState { get; set; } // 'stateless' | 'server-managed' | 'client-managed'
+        public string Secrets { get; set; } // 'stateless' | 'server-managed' | 'client-managed'
+        public Capability? Authentication { get; set; }
     }
 
     public enum Capability
diff --git a/src/Cody.Core/Cody.Core.csproj b/src/Cody.Core/Cody.Core.csproj
index edabc2a8..cdb44428 100644
--- a/src/Cody.Core/Cody.Core.csproj
+++ b/src/Cody.Core/Cody.Core.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Agent\WebviewMessageHandler.cs" />
     <Compile Include="DocumentSync\DocumentSyncCallback.cs" />
     <Compile Include="DocumentSync\IDocumentSyncActions.cs" />
+    <Compile Include="Infrastructure\ISecretStorageService.cs" />
     <Compile Include="Infrastructure\IProgressService.cs" />
     <Compile Include="Workspace\IFileService.cs" />
     <Compile Include="Ide\IVsVersionService.cs" />
diff --git a/src/Cody.Core/Infrastructure/ISecretStorageService.cs b/src/Cody.Core/Infrastructure/ISecretStorageService.cs
new file mode 100644
index 00000000..e4aae4bf
--- /dev/null
+++ b/src/Cody.Core/Infrastructure/ISecretStorageService.cs
@@ -0,0 +1,10 @@
+namespace Cody.Core.Infrastructure
+{
+    public interface ISecretStorageService
+    {
+        void Set(string key, string value);
+        string Get(string key);
+        void Delete(string key);
+        string AccessToken { get; set; }
+    }
+}
diff --git a/src/Cody.Core/Infrastructure/ISolutionService.cs b/src/Cody.Core/Infrastructure/ISolutionService.cs
index 56e3e06c..118b4b99 100644
--- a/src/Cody.Core/Infrastructure/ISolutionService.cs
+++ b/src/Cody.Core/Infrastructure/ISolutionService.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Cody.Core.Infrastructure
 {
     public interface ISolutionService
diff --git a/src/Cody.Core/Settings/IUserSettingsService.cs b/src/Cody.Core/Settings/IUserSettingsService.cs
index 41ba7efe..b24d0cf3 100644
--- a/src/Cody.Core/Settings/IUserSettingsService.cs
+++ b/src/Cody.Core/Settings/IUserSettingsService.cs
@@ -8,6 +8,7 @@ public interface IUserSettingsService
 
         string AccessToken { get; set; }
         string ServerEndpoint { get; set; }
+        string CodySettings { get; set; }
         event EventHandler AuthorizationDetailsChanged;
     }
 }
diff --git a/src/Cody.Core/Settings/UserSettingsService.cs b/src/Cody.Core/Settings/UserSettingsService.cs
index 3bafcf26..49c109a9 100644
--- a/src/Cody.Core/Settings/UserSettingsService.cs
+++ b/src/Cody.Core/Settings/UserSettingsService.cs
@@ -1,3 +1,4 @@
+using Cody.Core.Infrastructure;
 using Cody.Core.Logging;
 using System;
 
@@ -6,13 +7,15 @@ namespace Cody.Core.Settings
     public class UserSettingsService : IUserSettingsService
     {
         private readonly IUserSettingsProvider _settingsProvider;
+        private readonly ISecretStorageService _secretStorage;
         private readonly ILog _logger;
 
         public event EventHandler AuthorizationDetailsChanged;
 
-        public UserSettingsService(IUserSettingsProvider settingsProvider, ILog log)
+        public UserSettingsService(IUserSettingsProvider settingsProvider, ISecretStorageService secretStorage, ILog log)
         {
             _settingsProvider = settingsProvider;
+            _secretStorage = secretStorage;
             _logger = log;
         }
 
@@ -71,25 +74,32 @@ public string AccessToken
             get
             {
                 var envToken = Environment.GetEnvironmentVariable("SourcegraphCodyToken");
-                var userToken = GetOrDefault(nameof(AccessToken));
-                ;
+                var userToken = _secretStorage.AccessToken;
+
                 if (envToken != null && userToken == null) // use env token only when a user token is not set
                 {
                     _logger.Warn("You are using a access token from environment variables!");
                     return envToken;
                 }
 
-                return GetOrDefault(nameof(AccessToken));
+                return userToken;
             }
             set
             {
-                var token = GetOrDefault(nameof(AccessToken));
-                if (!string.Equals(value, token, StringComparison.InvariantCulture))
+                var userToken = _secretStorage.AccessToken;
+                if (!string.Equals(value, userToken, StringComparison.InvariantCulture))
                 {
-                    Set(nameof(AccessToken), value);
+                    _secretStorage.AccessToken = value;
                     AuthorizationDetailsChanged?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
+
+
+        public string CodySettings
+        {
+            get => GetOrDefault(nameof(CodySettings), string.Empty);
+            set => Set(nameof(CodySettings), value);
+        }
     }
 }
diff --git a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
index c5d49f07..c4b50a3d 100644
--- a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
+++ b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Cody.UI.Controls.Options.GeneralOptionsControl"
+<UserControl x:Class="Cody.UI.Controls.Options.GeneralOptionsControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -25,45 +25,45 @@
                 </Grid.ColumnDefinitions>
 
 
-                <!--Access Token-->
+                <!--Cody Configurations-->
                 <Label 
-                    Grid.Row="0"
+                    Grid.Row="1"
                     Grid.Column="0"
-                    Content="Access Token"
+                    Content="Cody Settings"
                     />
 
                 <TextBox
-                    Grid.Row="0"
+                    Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Height="20"
-                    Text="{Binding AccessToken, Mode=TwoWay}"
-                    ToolTip="Paste your access token. To create an access token, go to 'Settings' and then 'Access tokens' on the Sourcegraph instance."
-                    Name="AccessTokenTextBox"
+                    Height="50"
+                    Text="{Binding Configurations, Mode=TwoWay}"
+                    ToolTip="Your Cody configuration JSON file."
+                    Name="ConfigurationsTextBox"
                     />
 
-                <!--Get a token-->
+                <!--Get Help-->
                 <Button 
                     Margin="0 5 0 0"
                     Grid.Row="2"
                     Grid.Column="1"
                     Height="25"
                     Width="100"
-                    Content="Get a token"
+                    Content="Get Help"
                     HorizontalAlignment="Left"
                     Command="{Binding ActivateBetaCommand}"
                 />
 
                 <!--Sourcegraph URL-->
                 <Label
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="0"
                     Content="Sourcegraph URL"
                 />
 
                 <TextBox
                     Name="SourcegraphUrlTextBox"
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="1"
                     Width="400"
                     Height="20"
diff --git a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
index dd3d807e..fe9d200f 100644
--- a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
+++ b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 
 namespace Cody.UI.Controls.Options
 {
@@ -16,8 +16,8 @@ public void ForceBindingsUpdate()
         {
             // TextBox binding doesn't work when Visual Studio closes Options window
             // This is a workaround to get bindings updated. The second solution is to use NotifyPropertyChange for every TextBox in the Xaml, but current solution is a little more "clean" - everything is clearly visible in a one place.
-            AccessTokenTextBox.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
             SourcegraphUrlTextBox.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
+            ConfigurationsTextBox.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
         }
     }
 }
diff --git a/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs b/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
index e84ca8f8..253e9eaa 100644
--- a/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
+++ b/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using Cody.Core.Logging;
 using Cody.UI.MVVM;
@@ -20,15 +20,15 @@ public GeneralOptionsViewModel(ILog logger)
         private DelegateCommand _getTokenCommand;
         public DelegateCommand ActivateBetaCommand
         {
-            get { return _getTokenCommand = _getTokenCommand ?? new DelegateCommand(GetTokenCommandHandler); }
+            get { return _getTokenCommand = _getTokenCommand ?? new DelegateCommand(GetHelpCommandHandler); }
         }
 
-        private void GetTokenCommandHandler()
+        private void GetHelpCommandHandler()
         {
             var uri = string.Empty;
             try
             {
-                uri = new Uri("https://sourcegraph.com/user/settings/tokens").AbsoluteUri;
+                uri = new Uri("https://community.sourcegraph.com/").AbsoluteUri;
                 Process.Start(new ProcessStartInfo(uri));
             }
             catch(Exception ex)
@@ -37,16 +37,16 @@ private void GetTokenCommandHandler()
             }
         }
 
-        private string _accessToken;
+        private string _codyConfig;
 
-        public string AccessToken
+        public string CodyConfigurations
         {
-            get => _accessToken;
+            get => _codyConfig;
             set
             {
-                if (SetProperty(ref _accessToken, value))
+                if (SetProperty(ref _codyConfig, value))
                 {
-                    _logger.Debug($"Access Token set:{AccessToken}");
+                    _logger.Debug($"Cody Configurations set:{CodyConfigurations}");
                 }
 
             }
diff --git a/src/Cody.VisualStudio.Tests/ChatNotLoggedStateTests.cs b/src/Cody.VisualStudio.Tests/ChatNotLoggedStateTests.cs
index 045919f8..6e2e534d 100644
--- a/src/Cody.VisualStudio.Tests/ChatNotLoggedStateTests.cs
+++ b/src/Cody.VisualStudio.Tests/ChatNotLoggedStateTests.cs
@@ -16,9 +16,9 @@ public async Task Loads_Properly_InNotLoggedState()
             await GetPackageAsync();
             CodyPackage.ShowOptionPage(typeof(GeneralOptionsPage));
             await Task.Delay(TimeSpan.FromSeconds(1)); // HACK: properly wait for Options page
-
-            var accessToken = CodyPackage.GeneralOptionsViewModel.AccessToken;
-            CodyPackage.GeneralOptionsViewModel.AccessToken = $"{accessToken}INVALID"; // make it invalid
+            // TODO: Replace SourcegraphUrl with Token value
+            var accessToken = CodyPackage.GeneralOptionsViewModel.SourcegraphUrl;
+            CodyPackage.GeneralOptionsViewModel.SourcegraphUrl = $"{accessToken}INVALID"; // make it invalid
 
             await WaitForPlaywrightAsync();
             
@@ -28,7 +28,7 @@ public async Task Loads_Properly_InNotLoggedState()
             var getStarted = Page.GetByText(text);
             var textContents = await getStarted.AllTextContentsAsync();
 
-            CodyPackage.GeneralOptionsViewModel.AccessToken = $"{accessToken}"; // make it valid
+            CodyPackage.GeneralOptionsViewModel.SourcegraphUrl = $"{accessToken}"; // make it valid
 
             // then
             Assert.Equal(text, textContents.First());
diff --git a/src/Cody.VisualStudio/Cody.VisualStudio.csproj b/src/Cody.VisualStudio/Cody.VisualStudio.csproj
index 5efc981b..f919e046 100644
--- a/src/Cody.VisualStudio/Cody.VisualStudio.csproj
+++ b/src/Cody.VisualStudio/Cody.VisualStudio.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CodyPackage.cs" />
     <Compile Include="Properties\AssemblyVersion.cs" />
+    <Compile Include="Services\SecretStorageService.cs" />
     <Compile Include="Services\DocumentsSyncService.cs" />
     <Compile Include="Services\FileService.cs" />
     <Compile Include="Services\OptionsPage.cs">
diff --git a/src/Cody.VisualStudio/CodyPackage.cs b/src/Cody.VisualStudio/CodyPackage.cs
index c1aee6e9..b6b28516 100644
--- a/src/Cody.VisualStudio/CodyPackage.cs
+++ b/src/Cody.VisualStudio/CodyPackage.cs
@@ -17,6 +17,7 @@
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Connected.CredentialStorage;
 using Microsoft.VisualStudio.Shell.Events;
 using Microsoft.VisualStudio.Shell.Interop;
 using System;
@@ -79,6 +80,7 @@ public sealed class CodyPackage : AsyncPackage
         public IWebViewsManager WebViewsManager;
         public IProgressService ProgressService;
         public IAgentProxy AgentClient;
+        public ISecretStorageService SecretStorageService;
 
         public GeneralOptionsViewModel GeneralOptionsViewModel;
         public MainViewModel MainViewModel;
@@ -125,7 +127,10 @@ private void InitializeServices()
             SolutionService = new SolutionService(vsSolution);
             VersionService = loggerFactory.GetVersionService();
             VsVersionService = new VsVersionService(Logger);
-            UserSettingsService = new UserSettingsService(new UserSettingsProvider(this), Logger);
+
+            var vsSecretStorage = this.GetService<SVsCredentialStorageService, IVsCredentialStorageService>();
+            SecretStorageService = new SecretStorageService(vsSecretStorage);
+            UserSettingsService = new UserSettingsService(new UserSettingsProvider(this), SecretStorageService, Logger);
             UserSettingsService.AuthorizationDetailsChanged += AuthorizationDetailsChanged;
 
             StatusbarService = new StatusbarService();
@@ -134,7 +139,7 @@ private void InitializeServices()
             FileService = new FileService(this, Logger);
             var statusCenterService = this.GetService<SVsTaskStatusCenterService, IVsTaskStatusCenterService>();
             ProgressService = new ProgressService(statusCenterService);
-            NotificationHandlers = new NotificationHandlers(UserSettingsService, AgentNotificationsLogger, FileService);
+            NotificationHandlers = new NotificationHandlers(UserSettingsService, AgentNotificationsLogger, FileService, SecretStorageService);
             NotificationHandlers.OnOptionsPageShowRequest += HandleOnOptionsPageShowRequest;
             ProgressNotificationHandlers = new ProgressNotificationHandlers(ProgressService);
 
diff --git a/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs b/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
index f41fff01..faf28915 100644
--- a/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
+++ b/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
@@ -58,10 +58,10 @@ protected override void OnActivate(CancelEventArgs e)
             _logger.Debug($"Settings page activated.");
 
 
-            var accessToken = _settingsService.AccessToken;
+            var codyConfig = _settingsService.CodySettings;
             var sourcegraphUrl = _settingsService.ServerEndpoint;
 
-            _generalOptionsViewModel.AccessToken = accessToken;
+            _generalOptionsViewModel.CodyConfigurations = codyConfig;
             _generalOptionsViewModel.SourcegraphUrl = sourcegraphUrl;
 
             _logger.Debug($"Is canceled:{e.Cancel}");
@@ -72,10 +72,10 @@ protected override void OnApply(PageApplyEventArgs args)
         {
             _logger.Debug($"{args.ApplyBehavior}");
 
-            var accessToken = _generalOptionsViewModel.AccessToken;
+            var codyConfig = _generalOptionsViewModel.CodyConfigurations;
             var sourcegraphUrl = _generalOptionsViewModel.SourcegraphUrl;
 
-            _settingsService.AccessToken = accessToken;
+            _settingsService.CodySettings = codyConfig;
             _settingsService.ServerEndpoint = sourcegraphUrl;
         }
 
@@ -95,7 +95,7 @@ protected override void OnClosed(EventArgs e)
 
         public override void ResetSettings()
         {
-            _settingsService.AccessToken = string.Empty;
+            _settingsService.CodySettings = string.Empty;
             _settingsService.ServerEndpoint = string.Empty;
 
             base.ResetSettings();
diff --git a/src/Cody.VisualStudio/Services/OptionsPage.cs b/src/Cody.VisualStudio/Services/OptionsPage.cs
index a11a1882..3db13d9d 100644
--- a/src/Cody.VisualStudio/Services/OptionsPage.cs
+++ b/src/Cody.VisualStudio/Services/OptionsPage.cs
@@ -5,14 +5,14 @@ namespace Cody.VisualStudio
 {
     public class OptionsPage : DialogPage
     {
-        [Category("Authentication")]
-        [DisplayName("Access Token")]
-        [Description("Paste your access token. To create an access token, go to 'Settings' and then 'Access tokens' on the Sourcegraph instance.")]
-        public string TokenKey { get; set; }
-
         [Category("Authentication")]
         [DisplayName("Sourcegraph URL")]
-        [Description("Enter the URL of the Sourcegraph instance. For example, https://sourcegraph.example.com.")]
+        [Description("The URL of the Sourcegraph instance you are connecting to.")]
         public string Endpoint { get; set; }
+
+        [Category("Configurations")]
+        [DisplayName("Extension Settings")]
+        [Description("[Current Not Supported] Your Cody extension settings in JSON format.")]
+        public string Settings { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Cody.VisualStudio/Services/SecretStorageService.cs b/src/Cody.VisualStudio/Services/SecretStorageService.cs
new file mode 100644
index 00000000..006dba19
--- /dev/null
+++ b/src/Cody.VisualStudio/Services/SecretStorageService.cs
@@ -0,0 +1,51 @@
+using Cody.Core.Infrastructure;
+using Microsoft.VisualStudio.Shell.Connected.CredentialStorage;
+
+namespace Cody.VisualStudio.Services
+{
+    public class SecretStorageService : ISecretStorageService
+    {
+        private readonly IVsCredentialStorageService secretStorageService;
+        private readonly string AccessTokenKey = "cody.access-token";
+        private readonly string FeatureName = "Cody.VisualStudio";
+        private readonly string UserName = "CodyAgent";
+        private readonly string Type = "token";
+
+        public SecretStorageService(IVsCredentialStorageService secretStorageService)
+        {
+            this.secretStorageService = secretStorageService;
+        }
+
+        public string Get(string key)
+        {
+            var credentialKey = this.secretStorageService.CreateCredentialKey(FeatureName, key, UserName, Type);
+            var credential = this.secretStorageService.Retrieve(credentialKey);
+            return credential?.TokenValue;
+
+        }
+
+        public void Set(string key, string value)
+        {
+            var credentialKey = this.secretStorageService.CreateCredentialKey(FeatureName, key, UserName, Type);
+            this.secretStorageService.Add(credentialKey, value);
+        }
+
+        public void Delete(string key)
+        {
+            var credentialKey = this.secretStorageService.CreateCredentialKey(FeatureName, key, UserName, Type);
+            this.secretStorageService.Remove(credentialKey);
+        }
+
+        public string AccessToken
+        {
+            get
+            {
+                return this.Get(AccessTokenKey);
+            }
+            set
+            {
+                this.Set(AccessTokenKey, value);
+            }
+        }
+    }
+}
diff --git a/src/build.cake b/src/build.cake
index 47ec5804..82789773 100644
--- a/src/build.cake
+++ b/src/build.cake
@@ -24,7 +24,7 @@ var codyRepo = "https://github.com/sourcegraph/cody.git";
 var nodeBinaryUrl = "https://github.com/sourcegraph/node-binaries/raw/main/v20.12.2/node-win-x64.exe";
 var nodeArmBinaryUrl = "https://github.com/sourcegraph/node-binaries/raw/main/v20.12.2/node-win-arm64.exe";
 
-var codyCommit = "5bb199df24ceb3668a02e80c08fead2f65720d15";
+var codyCommit = "9a7e712ffce1b90bf2627dd528a68a803b7959ee";
 
 var marketplaceToken = EnvironmentVariable("CODY_VS_MARKETPLACE_RELEASE_TOKEN");