diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ConnectionProviderOptions.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ConnectionProviderOptions.cs
index 2a77daed..25532617 100644
--- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ConnectionProviderOptions.cs
+++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ConnectionProviderOptions.cs
@@ -36,6 +36,8 @@ namespace Microsoft.SqlTools.Hosting.Contracts
 
         public string Description {get; set; }
 
+         public string GroupName {get; set; }
+
         /// <summary>
         /// Type of the parameter.  Can be either string, number, or category.
         /// </summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs b/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs
index f68fca88..338ff0e6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs
@@ -237,7 +237,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting
                     new ConnectionOption
                     {
                         Name = "Password",
-                        Description = "SQL Loging password",
+                        Description = "SQL Login password",
                         ValueType = ConnectionOption.ValueTypePassword,
                         SpecialValueType = ConnectionOption.SpecialValuePasswordName,
                         IsIdentity = true,
@@ -272,31 +272,25 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting
                     {
                         Name = "Column Encrytion Setting",
                         ValueType = ConnectionOption.ValueTypeCategory,
+                        GroupName = "Security",
                         CategoryValues = new string[] { "Disabled", "Enabled" }
                     },
                     new ConnectionOption
                     {
                         Name = "Encrypt",
+                        GroupName = "Security",
                         ValueType = ConnectionOption.ValueTypeBoolean
                     },
                     new ConnectionOption
                     {
                         Name = "Persist Security Info",
+                        GroupName = "Security",
                         ValueType = ConnectionOption.ValueTypeBoolean
                     },
                     new ConnectionOption
                     {
                         Name = "Trust Server Certificate",
-                        ValueType = ConnectionOption.ValueTypeBoolean
-                    },
-                    new ConnectionOption
-                    {
-                        Name = "Persist Security Info",
-                        ValueType = ConnectionOption.ValueTypeBoolean
-                    },
-                    new ConnectionOption
-                    {
-                        Name = "Trust Server Certificate",
+                        GroupName = "Security",
                         ValueType = ConnectionOption.ValueTypeBoolean
                     },
                     new ConnectionOption