diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 0231b023..b0d6956d 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -1637,6 +1637,13 @@ IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE ([QuotaName] = N'Exchange2007.
 BEGIN
 INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (422, 12, 26, N'Exchange2007.DisclaimersAllowed', N'Disclaimers Allowed', 1, 0, NULL, NULL)   
 END
+GO
+
+--add SecurityGroupManagement Quota
+IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'HostedSolution.SecurityGroupManagement')
+BEGIN
+INSERT [dbo].[Quotas]  ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (423, 13, 5, N'HostedSolution.SecurityGroupManagement', N'Allow Security Group Management', 1, 0, NULL, NULL)
+END
 GO  
 
 -- Lync Enterprise Voice
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
index 58a410ac..c415b5a8 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
@@ -155,6 +155,7 @@ order by rg.groupOrder
         public const string ORGANIZATION_USERS = "HostedSolution.Users";
         public const string ORGANIZATION_DOMAINS = "HostedSolution.Domains";
         public const string ORGANIZATION_ALLOWCHANGEUPN = "HostedSolution.AllowChangeUPN";
+		public const string ORGANIZATION_SECURITYGROUPMANAGEMENT = "HostedSolution.SecurityGroupManagement";
         public const string CRM_USERS = "HostedCRM.Users";
         public const string CRM_ORGANIZATION = "HostedCRM.Organization";
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
index 088e33d6..d2c60dd8 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
@@ -39,7 +39,8 @@
 // 
 // This source code was auto-generated by wsdl, Version=2.0.50727.3038.
 // 
-namespace WebsitePanel.EnterpriseServer.HostedSolution {
+namespace WebsitePanel.EnterpriseServer.HostedSolution
+{
     using System.Xml.Serialization;
     using System.Web.Services;
     using System.ComponentModel;
@@ -53,151 +54,183 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
     using WebsitePanel.Providers.HostedSolution;
     using WebsitePanel.Providers.ResultObjects;
 
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name="esOrganizationsSoap", Namespace="http://tempuri.org/")]
+    [System.Web.Services.WebServiceBindingAttribute(Name = "esOrganizationsSoap", Namespace = "http://tempuri.org/")]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ResultObject))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
-    public partial class esOrganizations : Microsoft.Web.Services3.WebServicesClientProtocol {
+    public partial class esOrganizations : Microsoft.Web.Services3.WebServicesClientProtocol
+    {
 
         private System.Threading.SendOrPostCallback CheckOrgIdExistsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback CreateOrganizationOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetRawOrganizationsPagedOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationUserSummuryLetterOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SendOrganizationUserSummuryLetterOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback DeleteOrganizationOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationStatisticsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationStatisticsByOrganizationOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetAccountIdByUserPrincipalNameOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback AddOrganizationDomainOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback ChangeOrganizationDomainTypeOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationDomainsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback DeleteOrganizationDomainOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SetOrganizationDefaultDomainOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback CreateUserOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback ImportUserOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetOrganizationUsersPagedOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetUserGeneralSettingsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SetUserGeneralSettingsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SetUserPrincipalNameOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SetUserPasswordOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback SearchAccountsOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback DeleteUserOperationCompleted;
-        
+
         private System.Threading.SendOrPostCallback GetPasswordPolicyOperationCompleted;
-        
+
+        private System.Threading.SendOrPostCallback CreateSecurityGroupOperationCompleted;
+
+        private System.Threading.SendOrPostCallback GetSecurityGroupGeneralSettingsOperationCompleted;
+
+        private System.Threading.SendOrPostCallback DeleteSecurityGroupOperationCompleted;
+
+        private System.Threading.SendOrPostCallback SetSecurityGroupGeneralSettingsOperationCompleted;
+
+        private System.Threading.SendOrPostCallback GetOrganizationSecurityGroupsPagedOperationCompleted;
+
+        private System.Threading.SendOrPostCallback AddUserToSecurityGroupOperationCompleted;
+
         /// <remarks/>
-        public esOrganizations() {
+        public esOrganizations()
+        {
             this.Url = "http://localhost:9002/esOrganizations.asmx";
         }
 
         /// <remarks/>
         public event CheckOrgIdExistsCompletedEventHandler CheckOrgIdExistsCompleted;
-        
+
         /// <remarks/>
         public event CreateOrganizationCompletedEventHandler CreateOrganizationCompleted;
-        
+
         /// <remarks/>
         public event GetRawOrganizationsPagedCompletedEventHandler GetRawOrganizationsPagedCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationsCompletedEventHandler GetOrganizationsCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationUserSummuryLetterCompletedEventHandler GetOrganizationUserSummuryLetterCompleted;
-        
+
         /// <remarks/>
         public event SendOrganizationUserSummuryLetterCompletedEventHandler SendOrganizationUserSummuryLetterCompleted;
-        
+
         /// <remarks/>
         public event DeleteOrganizationCompletedEventHandler DeleteOrganizationCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationStatisticsCompletedEventHandler GetOrganizationStatisticsCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationStatisticsByOrganizationCompletedEventHandler GetOrganizationStatisticsByOrganizationCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationCompletedEventHandler GetOrganizationCompleted;
-        
+
         /// <remarks/>
         public event GetAccountIdByUserPrincipalNameCompletedEventHandler GetAccountIdByUserPrincipalNameCompleted;
-        
+
         /// <remarks/>
         public event AddOrganizationDomainCompletedEventHandler AddOrganizationDomainCompleted;
-        
+
         /// <remarks/>
         public event ChangeOrganizationDomainTypeCompletedEventHandler ChangeOrganizationDomainTypeCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationDomainsCompletedEventHandler GetOrganizationDomainsCompleted;
-        
+
         /// <remarks/>
         public event DeleteOrganizationDomainCompletedEventHandler DeleteOrganizationDomainCompleted;
-        
+
         /// <remarks/>
         public event SetOrganizationDefaultDomainCompletedEventHandler SetOrganizationDefaultDomainCompleted;
-        
+
         /// <remarks/>
         public event CreateUserCompletedEventHandler CreateUserCompleted;
-        
+
         /// <remarks/>
         public event ImportUserCompletedEventHandler ImportUserCompleted;
-        
+
         /// <remarks/>
         public event GetOrganizationUsersPagedCompletedEventHandler GetOrganizationUsersPagedCompleted;
-        
+
         /// <remarks/>
         public event GetUserGeneralSettingsCompletedEventHandler GetUserGeneralSettingsCompleted;
-        
+
         /// <remarks/>
         public event SetUserGeneralSettingsCompletedEventHandler SetUserGeneralSettingsCompleted;
-        
+
         /// <remarks/>
         public event SetUserPrincipalNameCompletedEventHandler SetUserPrincipalNameCompleted;
-        
+
         /// <remarks/>
         public event SetUserPasswordCompletedEventHandler SetUserPasswordCompleted;
-        
+
         /// <remarks/>
         public event SearchAccountsCompletedEventHandler SearchAccountsCompleted;
-        
+
         /// <remarks/>
         public event DeleteUserCompletedEventHandler DeleteUserCompleted;
-        
+
         /// <remarks/>
         public event GetPasswordPolicyCompletedEventHandler GetPasswordPolicyCompleted;
 
+        /// <remarks/>
+        public event CreateSecurityGroupCompletedEventHandler CreateSecurityGroupCompleted;
+
+        /// <remarks/>
+        public event GetSecurityGroupGeneralSettingsCompletedEventHandler GetSecurityGroupGeneralSettingsCompleted;
+
+        /// <remarks/>
+        public event DeleteSecurityGroupCompletedEventHandler DeleteSecurityGroupCompleted;
+
+        /// <remarks/>
+        public event SetSecurityGroupGeneralSettingsCompletedEventHandler SetSecurityGroupGeneralSettingsCompleted;
+
+        /// <remarks/>
+        public event GetOrganizationSecurityGroupsPagedCompletedEventHandler GetOrganizationSecurityGroupsPagedCompleted;
+
+        /// <remarks/>
+        public event AddUserToSecurityGroupCompletedEventHandler AddUserToSecurityGroupCompleted;
+
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CheckOrgIdExists", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public bool CheckOrgIdExists(string orgId)
@@ -246,10 +279,11 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                 this.CheckOrgIdExistsCompleted(this, new CheckOrgIdExistsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateOrganization", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreateOrganization(int packageId, string organizationID, string organizationName, string domainName) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateOrganization", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateOrganization(int packageId, string organizationID, string organizationName, string domainName)
+        {
             object[] results = this.Invoke("CreateOrganization", new object[] {
                         packageId,
                         organizationID,
@@ -257,32 +291,37 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         domainName});
             return ((int)(results[0]));
         }
-        
+
 
 
         /// <remarks/>
-        public System.IAsyncResult BeginCreateOrganization(int packageId, string organizationID, string organizationName, string domainName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginCreateOrganization(int packageId, string organizationID, string organizationName, string domainName, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("CreateOrganization", new object[] {
                         packageId,
                         organizationID,
                         organizationName,
                         domainName}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndCreateOrganization(System.IAsyncResult asyncResult) {
+        public int EndCreateOrganization(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void CreateOrganizationAsync(int packageId, string organizationID, string organizationName, string domainName) {
+        public void CreateOrganizationAsync(int packageId, string organizationID, string organizationName, string domainName)
+        {
             this.CreateOrganizationAsync(packageId, organizationID, organizationName, domainName, null);
         }
-        
+
         /// <remarks/>
-        public void CreateOrganizationAsync(int packageId, string organizationID, string organizationName, string domainName, object userState) {
-            if ((this.CreateOrganizationOperationCompleted == null)) {
+        public void CreateOrganizationAsync(int packageId, string organizationID, string organizationName, string domainName, object userState)
+        {
+            if ((this.CreateOrganizationOperationCompleted == null))
+            {
                 this.CreateOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateOrganizationOperationCompleted);
             }
             this.InvokeAsync("CreateOrganization", new object[] {
@@ -291,17 +330,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         organizationName,
                         domainName}, this.CreateOrganizationOperationCompleted, userState);
         }
-        
-        private void OnCreateOrganizationOperationCompleted(object arg) {
-            if ((this.CreateOrganizationCompleted != null)) {
+
+        private void OnCreateOrganizationOperationCompleted(object arg)
+        {
+            if ((this.CreateOrganizationCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreateOrganizationCompleted(this, new CreateOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetRawOrganizationsPaged", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Data.DataSet GetRawOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetRawOrganizationsPaged", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public System.Data.DataSet GetRawOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
             object[] results = this.Invoke("GetRawOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -312,9 +354,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         maximumRows});
             return ((System.Data.DataSet)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetRawOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetRawOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetRawOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -324,21 +367,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         startRow,
                         maximumRows}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public System.Data.DataSet EndGetRawOrganizationsPaged(System.IAsyncResult asyncResult) {
+        public System.Data.DataSet EndGetRawOrganizationsPaged(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((System.Data.DataSet)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetRawOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        public void GetRawOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
             this.GetRawOrganizationsPagedAsync(packageId, recursive, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
-        
+
         /// <remarks/>
-        public void GetRawOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
-            if ((this.GetRawOrganizationsPagedOperationCompleted == null)) {
+        public void GetRawOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
+        {
+            if ((this.GetRawOrganizationsPagedOperationCompleted == null))
+            {
                 this.GetRawOrganizationsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRawOrganizationsPagedOperationCompleted);
             }
             this.InvokeAsync("GetRawOrganizationsPaged", new object[] {
@@ -350,61 +397,72 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         startRow,
                         maximumRows}, this.GetRawOrganizationsPagedOperationCompleted, userState);
         }
-        
-        private void OnGetRawOrganizationsPagedOperationCompleted(object arg) {
-            if ((this.GetRawOrganizationsPagedCompleted != null)) {
+
+        private void OnGetRawOrganizationsPagedOperationCompleted(object arg)
+        {
+            if ((this.GetRawOrganizationsPagedCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetRawOrganizationsPagedCompleted(this, new GetRawOrganizationsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizations", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Organization[] GetOrganizations(int packageId, bool recursive) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizations", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Organization[] GetOrganizations(int packageId, bool recursive)
+        {
             object[] results = this.Invoke("GetOrganizations", new object[] {
                         packageId,
                         recursive});
             return ((Organization[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizations(int packageId, bool recursive, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizations(int packageId, bool recursive, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizations", new object[] {
                         packageId,
                         recursive}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public Organization[] EndGetOrganizations(System.IAsyncResult asyncResult) {
+        public Organization[] EndGetOrganizations(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((Organization[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationsAsync(int packageId, bool recursive) {
+        public void GetOrganizationsAsync(int packageId, bool recursive)
+        {
             this.GetOrganizationsAsync(packageId, recursive, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationsAsync(int packageId, bool recursive, object userState) {
-            if ((this.GetOrganizationsOperationCompleted == null)) {
+        public void GetOrganizationsAsync(int packageId, bool recursive, object userState)
+        {
+            if ((this.GetOrganizationsOperationCompleted == null))
+            {
                 this.GetOrganizationsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationsOperationCompleted);
             }
             this.InvokeAsync("GetOrganizations", new object[] {
                         packageId,
                         recursive}, this.GetOrganizationsOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationsOperationCompleted(object arg) {
-            if ((this.GetOrganizationsCompleted != null)) {
+
+        private void OnGetOrganizationsOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationsCompleted(this, new GetOrganizationsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationUserSummuryLetter", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public string GetOrganizationUserSummuryLetter(int itemId, int accountId, bool pmm, bool emailMode, bool signup) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationUserSummuryLetter", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public string GetOrganizationUserSummuryLetter(int itemId, int accountId, bool pmm, bool emailMode, bool signup)
+        {
             object[] results = this.Invoke("GetOrganizationUserSummuryLetter", new object[] {
                         itemId,
                         accountId,
@@ -413,9 +471,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         signup});
             return ((string)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationUserSummuryLetter(int itemId, int accountId, bool pmm, bool emailMode, bool signup, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationUserSummuryLetter(int itemId, int accountId, bool pmm, bool emailMode, bool signup, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizationUserSummuryLetter", new object[] {
                         itemId,
                         accountId,
@@ -423,21 +482,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         emailMode,
                         signup}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public string EndGetOrganizationUserSummuryLetter(System.IAsyncResult asyncResult) {
+        public string EndGetOrganizationUserSummuryLetter(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((string)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup) {
+        public void GetOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup)
+        {
             this.GetOrganizationUserSummuryLetterAsync(itemId, accountId, pmm, emailMode, signup, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup, object userState) {
-            if ((this.GetOrganizationUserSummuryLetterOperationCompleted == null)) {
+        public void GetOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup, object userState)
+        {
+            if ((this.GetOrganizationUserSummuryLetterOperationCompleted == null))
+            {
                 this.GetOrganizationUserSummuryLetterOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationUserSummuryLetterOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationUserSummuryLetter", new object[] {
@@ -447,17 +510,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         emailMode,
                         signup}, this.GetOrganizationUserSummuryLetterOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationUserSummuryLetterOperationCompleted(object arg) {
-            if ((this.GetOrganizationUserSummuryLetterCompleted != null)) {
+
+        private void OnGetOrganizationUserSummuryLetterOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationUserSummuryLetterCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationUserSummuryLetterCompleted(this, new GetOrganizationUserSummuryLetterCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SendOrganizationUserSummuryLetter", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SendOrganizationUserSummuryLetter(int itemId, int accountId, bool signup, string to, string cc) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SendOrganizationUserSummuryLetter", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SendOrganizationUserSummuryLetter(int itemId, int accountId, bool signup, string to, string cc)
+        {
             object[] results = this.Invoke("SendOrganizationUserSummuryLetter", new object[] {
                         itemId,
                         accountId,
@@ -466,9 +532,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         cc});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginSendOrganizationUserSummuryLetter(int itemId, int accountId, bool signup, string to, string cc, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSendOrganizationUserSummuryLetter(int itemId, int accountId, bool signup, string to, string cc, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("SendOrganizationUserSummuryLetter", new object[] {
                         itemId,
                         accountId,
@@ -476,21 +543,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         to,
                         cc}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndSendOrganizationUserSummuryLetter(System.IAsyncResult asyncResult) {
+        public int EndSendOrganizationUserSummuryLetter(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void SendOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool signup, string to, string cc) {
+        public void SendOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool signup, string to, string cc)
+        {
             this.SendOrganizationUserSummuryLetterAsync(itemId, accountId, signup, to, cc, null);
         }
-        
+
         /// <remarks/>
-        public void SendOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool signup, string to, string cc, object userState) {
-            if ((this.SendOrganizationUserSummuryLetterOperationCompleted == null)) {
+        public void SendOrganizationUserSummuryLetterAsync(int itemId, int accountId, bool signup, string to, string cc, object userState)
+        {
+            if ((this.SendOrganizationUserSummuryLetterOperationCompleted == null))
+            {
                 this.SendOrganizationUserSummuryLetterOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSendOrganizationUserSummuryLetterOperationCompleted);
             }
             this.InvokeAsync("SendOrganizationUserSummuryLetter", new object[] {
@@ -500,298 +571,354 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         to,
                         cc}, this.SendOrganizationUserSummuryLetterOperationCompleted, userState);
         }
-        
-        private void OnSendOrganizationUserSummuryLetterOperationCompleted(object arg) {
-            if ((this.SendOrganizationUserSummuryLetterCompleted != null)) {
+
+        private void OnSendOrganizationUserSummuryLetterOperationCompleted(object arg)
+        {
+            if ((this.SendOrganizationUserSummuryLetterCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SendOrganizationUserSummuryLetterCompleted(this, new SendOrganizationUserSummuryLetterCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteOrganization", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteOrganization(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteOrganization", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteOrganization(int itemId)
+        {
             object[] results = this.Invoke("DeleteOrganization", new object[] {
                         itemId});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginDeleteOrganization(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("DeleteOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndDeleteOrganization(System.IAsyncResult asyncResult) {
+        public int EndDeleteOrganization(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void DeleteOrganizationAsync(int itemId) {
+        public void DeleteOrganizationAsync(int itemId)
+        {
             this.DeleteOrganizationAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void DeleteOrganizationAsync(int itemId, object userState) {
-            if ((this.DeleteOrganizationOperationCompleted == null)) {
+        public void DeleteOrganizationAsync(int itemId, object userState)
+        {
+            if ((this.DeleteOrganizationOperationCompleted == null))
+            {
                 this.DeleteOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteOrganizationOperationCompleted);
             }
             this.InvokeAsync("DeleteOrganization", new object[] {
                         itemId}, this.DeleteOrganizationOperationCompleted, userState);
         }
-        
-        private void OnDeleteOrganizationOperationCompleted(object arg) {
-            if ((this.DeleteOrganizationCompleted != null)) {
+
+        private void OnDeleteOrganizationOperationCompleted(object arg)
+        {
+            if ((this.DeleteOrganizationCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteOrganizationCompleted(this, new DeleteOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationStatistics", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationStatistics GetOrganizationStatistics(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationStatistics", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationStatistics GetOrganizationStatistics(int itemId)
+        {
             object[] results = this.Invoke("GetOrganizationStatistics", new object[] {
                         itemId});
             return ((OrganizationStatistics)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationStatistics(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationStatistics(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizationStatistics", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationStatistics EndGetOrganizationStatistics(System.IAsyncResult asyncResult) {
+        public OrganizationStatistics EndGetOrganizationStatistics(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationStatistics)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationStatisticsAsync(int itemId) {
+        public void GetOrganizationStatisticsAsync(int itemId)
+        {
             this.GetOrganizationStatisticsAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationStatisticsAsync(int itemId, object userState) {
-            if ((this.GetOrganizationStatisticsOperationCompleted == null)) {
+        public void GetOrganizationStatisticsAsync(int itemId, object userState)
+        {
+            if ((this.GetOrganizationStatisticsOperationCompleted == null))
+            {
                 this.GetOrganizationStatisticsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationStatisticsOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationStatistics", new object[] {
                         itemId}, this.GetOrganizationStatisticsOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationStatisticsOperationCompleted(object arg) {
-            if ((this.GetOrganizationStatisticsCompleted != null)) {
+
+        private void OnGetOrganizationStatisticsOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationStatisticsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationStatisticsCompleted(this, new GetOrganizationStatisticsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationStatisticsByOrganization", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationStatistics GetOrganizationStatisticsByOrganization(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationStatisticsByOrganization", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationStatistics GetOrganizationStatisticsByOrganization(int itemId)
+        {
             object[] results = this.Invoke("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId});
             return ((OrganizationStatistics)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationStatisticsByOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationStatisticsByOrganization(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationStatistics EndGetOrganizationStatisticsByOrganization(System.IAsyncResult asyncResult) {
+        public OrganizationStatistics EndGetOrganizationStatisticsByOrganization(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationStatistics)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationStatisticsByOrganizationAsync(int itemId) {
+        public void GetOrganizationStatisticsByOrganizationAsync(int itemId)
+        {
             this.GetOrganizationStatisticsByOrganizationAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationStatisticsByOrganizationAsync(int itemId, object userState) {
-            if ((this.GetOrganizationStatisticsByOrganizationOperationCompleted == null)) {
+        public void GetOrganizationStatisticsByOrganizationAsync(int itemId, object userState)
+        {
+            if ((this.GetOrganizationStatisticsByOrganizationOperationCompleted == null))
+            {
                 this.GetOrganizationStatisticsByOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationStatisticsByOrganizationOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId}, this.GetOrganizationStatisticsByOrganizationOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationStatisticsByOrganizationOperationCompleted(object arg) {
-            if ((this.GetOrganizationStatisticsByOrganizationCompleted != null)) {
+
+        private void OnGetOrganizationStatisticsByOrganizationOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationStatisticsByOrganizationCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationStatisticsByOrganizationCompleted(this, new GetOrganizationStatisticsByOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganization", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Organization GetOrganization(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganization", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Organization GetOrganization(int itemId)
+        {
             object[] results = this.Invoke("GetOrganization", new object[] {
                         itemId});
             return ((Organization)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganization(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public Organization EndGetOrganization(System.IAsyncResult asyncResult) {
+        public Organization EndGetOrganization(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((Organization)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationAsync(int itemId) {
+        public void GetOrganizationAsync(int itemId)
+        {
             this.GetOrganizationAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationAsync(int itemId, object userState) {
-            if ((this.GetOrganizationOperationCompleted == null)) {
+        public void GetOrganizationAsync(int itemId, object userState)
+        {
+            if ((this.GetOrganizationOperationCompleted == null))
+            {
                 this.GetOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationOperationCompleted);
             }
             this.InvokeAsync("GetOrganization", new object[] {
                         itemId}, this.GetOrganizationOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationOperationCompleted(object arg) {
-            if ((this.GetOrganizationCompleted != null)) {
+
+        private void OnGetOrganizationOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationCompleted(this, new GetOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetAccountIdByUserPrincipalName", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int GetAccountIdByUserPrincipalName(int itemId, string userPrincipalName) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetAccountIdByUserPrincipalName", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int GetAccountIdByUserPrincipalName(int itemId, string userPrincipalName)
+        {
             object[] results = this.Invoke("GetAccountIdByUserPrincipalName", new object[] {
                         itemId,
                         userPrincipalName});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetAccountIdByUserPrincipalName(int itemId, string userPrincipalName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetAccountIdByUserPrincipalName(int itemId, string userPrincipalName, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetAccountIdByUserPrincipalName", new object[] {
                         itemId,
                         userPrincipalName}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndGetAccountIdByUserPrincipalName(System.IAsyncResult asyncResult) {
+        public int EndGetAccountIdByUserPrincipalName(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetAccountIdByUserPrincipalNameAsync(int itemId, string userPrincipalName) {
+        public void GetAccountIdByUserPrincipalNameAsync(int itemId, string userPrincipalName)
+        {
             this.GetAccountIdByUserPrincipalNameAsync(itemId, userPrincipalName, null);
         }
-        
+
         /// <remarks/>
-        public void GetAccountIdByUserPrincipalNameAsync(int itemId, string userPrincipalName, object userState) {
-            if ((this.GetAccountIdByUserPrincipalNameOperationCompleted == null)) {
+        public void GetAccountIdByUserPrincipalNameAsync(int itemId, string userPrincipalName, object userState)
+        {
+            if ((this.GetAccountIdByUserPrincipalNameOperationCompleted == null))
+            {
                 this.GetAccountIdByUserPrincipalNameOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAccountIdByUserPrincipalNameOperationCompleted);
             }
             this.InvokeAsync("GetAccountIdByUserPrincipalName", new object[] {
                         itemId,
                         userPrincipalName}, this.GetAccountIdByUserPrincipalNameOperationCompleted, userState);
         }
-        
-        private void OnGetAccountIdByUserPrincipalNameOperationCompleted(object arg) {
-            if ((this.GetAccountIdByUserPrincipalNameCompleted != null)) {
+
+        private void OnGetAccountIdByUserPrincipalNameOperationCompleted(object arg)
+        {
+            if ((this.GetAccountIdByUserPrincipalNameCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetAccountIdByUserPrincipalNameCompleted(this, new GetAccountIdByUserPrincipalNameCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddOrganizationDomain", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddOrganizationDomain(int itemId, string domainName) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddOrganizationDomain", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddOrganizationDomain(int itemId, string domainName)
+        {
             object[] results = this.Invoke("AddOrganizationDomain", new object[] {
                         itemId,
                         domainName});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginAddOrganizationDomain(int itemId, string domainName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginAddOrganizationDomain(int itemId, string domainName, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("AddOrganizationDomain", new object[] {
                         itemId,
                         domainName}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndAddOrganizationDomain(System.IAsyncResult asyncResult) {
+        public int EndAddOrganizationDomain(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void AddOrganizationDomainAsync(int itemId, string domainName) {
+        public void AddOrganizationDomainAsync(int itemId, string domainName)
+        {
             this.AddOrganizationDomainAsync(itemId, domainName, null);
         }
-        
+
         /// <remarks/>
-        public void AddOrganizationDomainAsync(int itemId, string domainName, object userState) {
-            if ((this.AddOrganizationDomainOperationCompleted == null)) {
+        public void AddOrganizationDomainAsync(int itemId, string domainName, object userState)
+        {
+            if ((this.AddOrganizationDomainOperationCompleted == null))
+            {
                 this.AddOrganizationDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddOrganizationDomainOperationCompleted);
             }
             this.InvokeAsync("AddOrganizationDomain", new object[] {
                         itemId,
                         domainName}, this.AddOrganizationDomainOperationCompleted, userState);
         }
-        
-        private void OnAddOrganizationDomainOperationCompleted(object arg) {
-            if ((this.AddOrganizationDomainCompleted != null)) {
+
+        private void OnAddOrganizationDomainOperationCompleted(object arg)
+        {
+            if ((this.AddOrganizationDomainCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddOrganizationDomainCompleted(this, new AddOrganizationDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ChangeOrganizationDomainType", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int ChangeOrganizationDomainType(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ChangeOrganizationDomainType", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int ChangeOrganizationDomainType(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType)
+        {
             object[] results = this.Invoke("ChangeOrganizationDomainType", new object[] {
                         itemId,
                         domainId,
                         newDomainType});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginChangeOrganizationDomainType(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginChangeOrganizationDomainType(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("ChangeOrganizationDomainType", new object[] {
                         itemId,
                         domainId,
                         newDomainType}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndChangeOrganizationDomainType(System.IAsyncResult asyncResult) {
+        public int EndChangeOrganizationDomainType(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void ChangeOrganizationDomainTypeAsync(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType) {
+        public void ChangeOrganizationDomainTypeAsync(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType)
+        {
             this.ChangeOrganizationDomainTypeAsync(itemId, domainId, newDomainType, null);
         }
-        
+
         /// <remarks/>
-        public void ChangeOrganizationDomainTypeAsync(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType, object userState) {
-            if ((this.ChangeOrganizationDomainTypeOperationCompleted == null)) {
+        public void ChangeOrganizationDomainTypeAsync(int itemId, int domainId, ExchangeAcceptedDomainType newDomainType, object userState)
+        {
+            if ((this.ChangeOrganizationDomainTypeOperationCompleted == null))
+            {
                 this.ChangeOrganizationDomainTypeOperationCompleted = new System.Threading.SendOrPostCallback(this.OnChangeOrganizationDomainTypeOperationCompleted);
             }
             this.InvokeAsync("ChangeOrganizationDomainType", new object[] {
@@ -799,146 +926,173 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         domainId,
                         newDomainType}, this.ChangeOrganizationDomainTypeOperationCompleted, userState);
         }
-        
-        private void OnChangeOrganizationDomainTypeOperationCompleted(object arg) {
-            if ((this.ChangeOrganizationDomainTypeCompleted != null)) {
+
+        private void OnChangeOrganizationDomainTypeOperationCompleted(object arg)
+        {
+            if ((this.ChangeOrganizationDomainTypeCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.ChangeOrganizationDomainTypeCompleted(this, new ChangeOrganizationDomainTypeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationDomains", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationDomainName[] GetOrganizationDomains(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationDomains", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationDomainName[] GetOrganizationDomains(int itemId)
+        {
             object[] results = this.Invoke("GetOrganizationDomains", new object[] {
                         itemId});
             return ((OrganizationDomainName[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationDomains(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationDomains(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizationDomains", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationDomainName[] EndGetOrganizationDomains(System.IAsyncResult asyncResult) {
+        public OrganizationDomainName[] EndGetOrganizationDomains(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationDomainName[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationDomainsAsync(int itemId) {
+        public void GetOrganizationDomainsAsync(int itemId)
+        {
             this.GetOrganizationDomainsAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationDomainsAsync(int itemId, object userState) {
-            if ((this.GetOrganizationDomainsOperationCompleted == null)) {
+        public void GetOrganizationDomainsAsync(int itemId, object userState)
+        {
+            if ((this.GetOrganizationDomainsOperationCompleted == null))
+            {
                 this.GetOrganizationDomainsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationDomainsOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationDomains", new object[] {
                         itemId}, this.GetOrganizationDomainsOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationDomainsOperationCompleted(object arg) {
-            if ((this.GetOrganizationDomainsCompleted != null)) {
+
+        private void OnGetOrganizationDomainsOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationDomainsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationDomainsCompleted(this, new GetOrganizationDomainsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteOrganizationDomain", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteOrganizationDomain(int itemId, int domainId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteOrganizationDomain", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteOrganizationDomain(int itemId, int domainId)
+        {
             object[] results = this.Invoke("DeleteOrganizationDomain", new object[] {
                         itemId,
                         domainId});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteOrganizationDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginDeleteOrganizationDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("DeleteOrganizationDomain", new object[] {
                         itemId,
                         domainId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndDeleteOrganizationDomain(System.IAsyncResult asyncResult) {
+        public int EndDeleteOrganizationDomain(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void DeleteOrganizationDomainAsync(int itemId, int domainId) {
+        public void DeleteOrganizationDomainAsync(int itemId, int domainId)
+        {
             this.DeleteOrganizationDomainAsync(itemId, domainId, null);
         }
-        
+
         /// <remarks/>
-        public void DeleteOrganizationDomainAsync(int itemId, int domainId, object userState) {
-            if ((this.DeleteOrganizationDomainOperationCompleted == null)) {
+        public void DeleteOrganizationDomainAsync(int itemId, int domainId, object userState)
+        {
+            if ((this.DeleteOrganizationDomainOperationCompleted == null))
+            {
                 this.DeleteOrganizationDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteOrganizationDomainOperationCompleted);
             }
             this.InvokeAsync("DeleteOrganizationDomain", new object[] {
                         itemId,
                         domainId}, this.DeleteOrganizationDomainOperationCompleted, userState);
         }
-        
-        private void OnDeleteOrganizationDomainOperationCompleted(object arg) {
-            if ((this.DeleteOrganizationDomainCompleted != null)) {
+
+        private void OnDeleteOrganizationDomainOperationCompleted(object arg)
+        {
+            if ((this.DeleteOrganizationDomainCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteOrganizationDomainCompleted(this, new DeleteOrganizationDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetOrganizationDefaultDomain", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetOrganizationDefaultDomain(int itemId, int domainId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetOrganizationDefaultDomain", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetOrganizationDefaultDomain(int itemId, int domainId)
+        {
             object[] results = this.Invoke("SetOrganizationDefaultDomain", new object[] {
                         itemId,
                         domainId});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginSetOrganizationDefaultDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSetOrganizationDefaultDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("SetOrganizationDefaultDomain", new object[] {
                         itemId,
                         domainId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndSetOrganizationDefaultDomain(System.IAsyncResult asyncResult) {
+        public int EndSetOrganizationDefaultDomain(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void SetOrganizationDefaultDomainAsync(int itemId, int domainId) {
+        public void SetOrganizationDefaultDomainAsync(int itemId, int domainId)
+        {
             this.SetOrganizationDefaultDomainAsync(itemId, domainId, null);
         }
-        
+
         /// <remarks/>
-        public void SetOrganizationDefaultDomainAsync(int itemId, int domainId, object userState) {
-            if ((this.SetOrganizationDefaultDomainOperationCompleted == null)) {
+        public void SetOrganizationDefaultDomainAsync(int itemId, int domainId, object userState)
+        {
+            if ((this.SetOrganizationDefaultDomainOperationCompleted == null))
+            {
                 this.SetOrganizationDefaultDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetOrganizationDefaultDomainOperationCompleted);
             }
             this.InvokeAsync("SetOrganizationDefaultDomain", new object[] {
                         itemId,
                         domainId}, this.SetOrganizationDefaultDomainOperationCompleted, userState);
         }
-        
-        private void OnSetOrganizationDefaultDomainOperationCompleted(object arg) {
-            if ((this.SetOrganizationDefaultDomainCompleted != null)) {
+
+        private void OnSetOrganizationDefaultDomainOperationCompleted(object arg)
+        {
+            if ((this.SetOrganizationDefaultDomainCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetOrganizationDefaultDomainCompleted(this, new SetOrganizationDefaultDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateUser", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreateUser(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateUser", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateUser(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to)
+        {
             object[] results = this.Invoke("CreateUser", new object[] {
                         itemId,
                         displayName,
@@ -950,9 +1104,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         to});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginCreateUser(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginCreateUser(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("CreateUser", new object[] {
                         itemId,
                         displayName,
@@ -963,21 +1118,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         sendNotification,
                         to}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndCreateUser(System.IAsyncResult asyncResult) {
+        public int EndCreateUser(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void CreateUserAsync(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to) {
+        public void CreateUserAsync(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to)
+        {
             this.CreateUserAsync(itemId, displayName, name, domain, password, subscriberNumber, sendNotification, to, null);
         }
-        
+
         /// <remarks/>
-        public void CreateUserAsync(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to, object userState) {
-            if ((this.CreateUserOperationCompleted == null)) {
+        public void CreateUserAsync(int itemId, string displayName, string name, string domain, string password, string subscriberNumber, bool sendNotification, string to, object userState)
+        {
+            if ((this.CreateUserOperationCompleted == null))
+            {
                 this.CreateUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateUserOperationCompleted);
             }
             this.InvokeAsync("CreateUser", new object[] {
@@ -990,17 +1149,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         sendNotification,
                         to}, this.CreateUserOperationCompleted, userState);
         }
-        
-        private void OnCreateUserOperationCompleted(object arg) {
-            if ((this.CreateUserCompleted != null)) {
+
+        private void OnCreateUserOperationCompleted(object arg)
+        {
+            if ((this.CreateUserCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreateUserCompleted(this, new CreateUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ImportUser", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int ImportUser(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ImportUser", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int ImportUser(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber)
+        {
             object[] results = this.Invoke("ImportUser", new object[] {
                         itemId,
                         accountName,
@@ -1011,9 +1173,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         subscriberNumber});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginImportUser(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginImportUser(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("ImportUser", new object[] {
                         itemId,
                         accountName,
@@ -1023,21 +1186,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         password,
                         subscriberNumber}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndImportUser(System.IAsyncResult asyncResult) {
+        public int EndImportUser(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void ImportUserAsync(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber) {
+        public void ImportUserAsync(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber)
+        {
             this.ImportUserAsync(itemId, accountName, displayName, name, domain, password, subscriberNumber, null);
         }
-        
+
         /// <remarks/>
-        public void ImportUserAsync(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber, object userState) {
-            if ((this.ImportUserOperationCompleted == null)) {
+        public void ImportUserAsync(int itemId, string accountName, string displayName, string name, string domain, string password, string subscriberNumber, object userState)
+        {
+            if ((this.ImportUserOperationCompleted == null))
+            {
                 this.ImportUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnImportUserOperationCompleted);
             }
             this.InvokeAsync("ImportUser", new object[] {
@@ -1049,17 +1216,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         password,
                         subscriberNumber}, this.ImportUserOperationCompleted, userState);
         }
-        
-        private void OnImportUserOperationCompleted(object arg) {
-            if ((this.ImportUserCompleted != null)) {
+
+        private void OnImportUserOperationCompleted(object arg)
+        {
+            if ((this.ImportUserCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.ImportUserCompleted(this, new ImportUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationUsersPaged", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationUsersPaged GetOrganizationUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationUsersPaged", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationUsersPaged GetOrganizationUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
             object[] results = this.Invoke("GetOrganizationUsersPaged", new object[] {
                         itemId,
                         filterColumn,
@@ -1069,9 +1239,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         maximumRows});
             return ((OrganizationUsersPaged)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetOrganizationUsersPaged", new object[] {
                         itemId,
                         filterColumn,
@@ -1080,21 +1251,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         startRow,
                         maximumRows}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationUsersPaged EndGetOrganizationUsersPaged(System.IAsyncResult asyncResult) {
+        public OrganizationUsersPaged EndGetOrganizationUsersPaged(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationUsersPaged)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationUsersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        public void GetOrganizationUsersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
             this.GetOrganizationUsersPagedAsync(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
-        
+
         /// <remarks/>
-        public void GetOrganizationUsersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
-            if ((this.GetOrganizationUsersPagedOperationCompleted == null)) {
+        public void GetOrganizationUsersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
+        {
+            if ((this.GetOrganizationUsersPagedOperationCompleted == null))
+            {
                 this.GetOrganizationUsersPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationUsersPagedOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationUsersPaged", new object[] {
@@ -1105,90 +1280,101 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         startRow,
                         maximumRows}, this.GetOrganizationUsersPagedOperationCompleted, userState);
         }
-        
-        private void OnGetOrganizationUsersPagedOperationCompleted(object arg) {
-            if ((this.GetOrganizationUsersPagedCompleted != null)) {
+
+        private void OnGetOrganizationUsersPagedOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationUsersPagedCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationUsersPagedCompleted(this, new GetOrganizationUsersPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetUserGeneralSettings", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationUser GetUserGeneralSettings(int itemId, int accountId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetUserGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationUser GetUserGeneralSettings(int itemId, int accountId)
+        {
             object[] results = this.Invoke("GetUserGeneralSettings", new object[] {
                         itemId,
                         accountId});
             return ((OrganizationUser)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetUserGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetUserGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetUserGeneralSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationUser EndGetUserGeneralSettings(System.IAsyncResult asyncResult) {
+        public OrganizationUser EndGetUserGeneralSettings(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationUser)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetUserGeneralSettingsAsync(int itemId, int accountId) {
+        public void GetUserGeneralSettingsAsync(int itemId, int accountId)
+        {
             this.GetUserGeneralSettingsAsync(itemId, accountId, null);
         }
-        
+
         /// <remarks/>
-        public void GetUserGeneralSettingsAsync(int itemId, int accountId, object userState) {
-            if ((this.GetUserGeneralSettingsOperationCompleted == null)) {
+        public void GetUserGeneralSettingsAsync(int itemId, int accountId, object userState)
+        {
+            if ((this.GetUserGeneralSettingsOperationCompleted == null))
+            {
                 this.GetUserGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetUserGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("GetUserGeneralSettings", new object[] {
                         itemId,
                         accountId}, this.GetUserGeneralSettingsOperationCompleted, userState);
         }
-        
-        private void OnGetUserGeneralSettingsOperationCompleted(object arg) {
-            if ((this.GetUserGeneralSettingsCompleted != null)) {
+
+        private void OnGetUserGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.GetUserGeneralSettingsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetUserGeneralSettingsCompleted(this, new GetUserGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserGeneralSettings", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public int SetUserGeneralSettings(
-                    int itemId, 
-                    int accountId, 
-                    string displayName, 
-                    string password, 
-                    bool hideAddressBook, 
-                    bool disabled, 
-                    bool locked, 
-                    string firstName, 
-                    string initials, 
-                    string lastName, 
-                    string address, 
-                    string city, 
-                    string state, 
-                    string zip, 
-                    string country, 
-                    string jobTitle, 
-                    string company, 
-                    string department, 
-                    string office, 
-                    string managerAccountName, 
-                    string businessPhone, 
-                    string fax, 
-                    string homePhone, 
-                    string mobilePhone, 
-                    string pager, 
-                    string webPage, 
-                    string notes, 
-                    string externalEmail, 
-                    string subscriberNumber) {
+                    int itemId,
+                    int accountId,
+                    string displayName,
+                    string password,
+                    bool hideAddressBook,
+                    bool disabled,
+                    bool locked,
+                    string firstName,
+                    string initials,
+                    string lastName,
+                    string address,
+                    string city,
+                    string state,
+                    string zip,
+                    string country,
+                    string jobTitle,
+                    string company,
+                    string department,
+                    string office,
+                    string managerAccountName,
+                    string businessPhone,
+                    string fax,
+                    string homePhone,
+                    string mobilePhone,
+                    string pager,
+                    string webPage,
+                    string notes,
+                    string externalEmail,
+                    string subscriberNumber)
+        {
             object[] results = this.Invoke("SetUserGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -1221,40 +1407,41 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         subscriberNumber});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
         public System.IAsyncResult BeginSetUserGeneralSettings(
-                    int itemId, 
-                    int accountId, 
-                    string displayName, 
-                    string password, 
-                    bool hideAddressBook, 
-                    bool disabled, 
-                    bool locked, 
-                    string firstName, 
-                    string initials, 
-                    string lastName, 
-                    string address, 
-                    string city, 
-                    string state, 
-                    string zip, 
-                    string country, 
-                    string jobTitle, 
-                    string company, 
-                    string department, 
-                    string office, 
-                    string managerAccountName, 
-                    string businessPhone, 
-                    string fax, 
-                    string homePhone, 
-                    string mobilePhone, 
-                    string pager, 
-                    string webPage, 
-                    string notes, 
-                    string externalEmail, 
-                    string subscriberNumber, 
-                    System.AsyncCallback callback, 
-                    object asyncState) {
+                    int itemId,
+                    int accountId,
+                    string displayName,
+                    string password,
+                    bool hideAddressBook,
+                    bool disabled,
+                    bool locked,
+                    string firstName,
+                    string initials,
+                    string lastName,
+                    string address,
+                    string city,
+                    string state,
+                    string zip,
+                    string country,
+                    string jobTitle,
+                    string company,
+                    string department,
+                    string office,
+                    string managerAccountName,
+                    string businessPhone,
+                    string fax,
+                    string homePhone,
+                    string mobilePhone,
+                    string pager,
+                    string webPage,
+                    string notes,
+                    string externalEmail,
+                    string subscriberNumber,
+                    System.AsyncCallback callback,
+                    object asyncState)
+        {
             return this.BeginInvoke("SetUserGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -1286,80 +1473,84 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         externalEmail,
                         subscriberNumber}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndSetUserGeneralSettings(System.IAsyncResult asyncResult) {
+        public int EndSetUserGeneralSettings(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
         public void SetUserGeneralSettingsAsync(
-                    int itemId, 
-                    int accountId, 
-                    string displayName, 
-                    string password, 
-                    bool hideAddressBook, 
-                    bool disabled, 
-                    bool locked, 
-                    string firstName, 
-                    string initials, 
-                    string lastName, 
-                    string address, 
-                    string city, 
-                    string state, 
-                    string zip, 
-                    string country, 
-                    string jobTitle, 
-                    string company, 
-                    string department, 
-                    string office, 
-                    string managerAccountName, 
-                    string businessPhone, 
-                    string fax, 
-                    string homePhone, 
-                    string mobilePhone, 
-                    string pager, 
-                    string webPage, 
-                    string notes, 
-                    string externalEmail, 
-                    string subscriberNumber) {
+                    int itemId,
+                    int accountId,
+                    string displayName,
+                    string password,
+                    bool hideAddressBook,
+                    bool disabled,
+                    bool locked,
+                    string firstName,
+                    string initials,
+                    string lastName,
+                    string address,
+                    string city,
+                    string state,
+                    string zip,
+                    string country,
+                    string jobTitle,
+                    string company,
+                    string department,
+                    string office,
+                    string managerAccountName,
+                    string businessPhone,
+                    string fax,
+                    string homePhone,
+                    string mobilePhone,
+                    string pager,
+                    string webPage,
+                    string notes,
+                    string externalEmail,
+                    string subscriberNumber)
+        {
             this.SetUserGeneralSettingsAsync(itemId, accountId, displayName, password, hideAddressBook, disabled, locked, firstName, initials, lastName, address, city, state, zip, country, jobTitle, company, department, office, managerAccountName, businessPhone, fax, homePhone, mobilePhone, pager, webPage, notes, externalEmail, subscriberNumber, null);
         }
-        
+
         /// <remarks/>
         public void SetUserGeneralSettingsAsync(
-                    int itemId, 
-                    int accountId, 
-                    string displayName, 
-                    string password, 
-                    bool hideAddressBook, 
-                    bool disabled, 
-                    bool locked, 
-                    string firstName, 
-                    string initials, 
-                    string lastName, 
-                    string address, 
-                    string city, 
-                    string state, 
-                    string zip, 
-                    string country, 
-                    string jobTitle, 
-                    string company, 
-                    string department, 
-                    string office, 
-                    string managerAccountName, 
-                    string businessPhone, 
-                    string fax, 
-                    string homePhone, 
-                    string mobilePhone, 
-                    string pager, 
-                    string webPage, 
-                    string notes, 
-                    string externalEmail, 
-                    string subscriberNumber, 
-                    object userState) {
-            if ((this.SetUserGeneralSettingsOperationCompleted == null)) {
+                    int itemId,
+                    int accountId,
+                    string displayName,
+                    string password,
+                    bool hideAddressBook,
+                    bool disabled,
+                    bool locked,
+                    string firstName,
+                    string initials,
+                    string lastName,
+                    string address,
+                    string city,
+                    string state,
+                    string zip,
+                    string country,
+                    string jobTitle,
+                    string company,
+                    string department,
+                    string office,
+                    string managerAccountName,
+                    string businessPhone,
+                    string fax,
+                    string homePhone,
+                    string mobilePhone,
+                    string pager,
+                    string webPage,
+                    string notes,
+                    string externalEmail,
+                    string subscriberNumber,
+                    object userState)
+        {
+            if ((this.SetUserGeneralSettingsOperationCompleted == null))
+            {
                 this.SetUserGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetUserGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetUserGeneralSettings", new object[] {
@@ -1393,17 +1584,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         externalEmail,
                         subscriberNumber}, this.SetUserGeneralSettingsOperationCompleted, userState);
         }
-        
-        private void OnSetUserGeneralSettingsOperationCompleted(object arg) {
-            if ((this.SetUserGeneralSettingsCompleted != null)) {
+
+        private void OnSetUserGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.SetUserGeneralSettingsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetUserGeneralSettingsCompleted(this, new SetUserGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserPrincipalName", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetUserPrincipalName(int itemId, int accountId, string userPrincipalName, bool inherit) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserPrincipalName", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetUserPrincipalName(int itemId, int accountId, string userPrincipalName, bool inherit)
+        {
             object[] results = this.Invoke("SetUserPrincipalName", new object[] {
                         itemId,
                         accountId,
@@ -1411,30 +1605,35 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         inherit});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginSetUserPrincipalName(int itemId, int accountId, string userPrincipalName, bool inherit, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSetUserPrincipalName(int itemId, int accountId, string userPrincipalName, bool inherit, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("SetUserPrincipalName", new object[] {
                         itemId,
                         accountId,
                         userPrincipalName,
                         inherit}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndSetUserPrincipalName(System.IAsyncResult asyncResult) {
+        public int EndSetUserPrincipalName(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void SetUserPrincipalNameAsync(int itemId, int accountId, string userPrincipalName, bool inherit) {
+        public void SetUserPrincipalNameAsync(int itemId, int accountId, string userPrincipalName, bool inherit)
+        {
             this.SetUserPrincipalNameAsync(itemId, accountId, userPrincipalName, inherit, null);
         }
-        
+
         /// <remarks/>
-        public void SetUserPrincipalNameAsync(int itemId, int accountId, string userPrincipalName, bool inherit, object userState) {
-            if ((this.SetUserPrincipalNameOperationCompleted == null)) {
+        public void SetUserPrincipalNameAsync(int itemId, int accountId, string userPrincipalName, bool inherit, object userState)
+        {
+            if ((this.SetUserPrincipalNameOperationCompleted == null))
+            {
                 this.SetUserPrincipalNameOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetUserPrincipalNameOperationCompleted);
             }
             this.InvokeAsync("SetUserPrincipalName", new object[] {
@@ -1443,46 +1642,54 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         userPrincipalName,
                         inherit}, this.SetUserPrincipalNameOperationCompleted, userState);
         }
-        
-        private void OnSetUserPrincipalNameOperationCompleted(object arg) {
-            if ((this.SetUserPrincipalNameCompleted != null)) {
+
+        private void OnSetUserPrincipalNameOperationCompleted(object arg)
+        {
+            if ((this.SetUserPrincipalNameCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetUserPrincipalNameCompleted(this, new SetUserPrincipalNameCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserPassword", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetUserPassword(int itemId, int accountId, string password) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserPassword", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetUserPassword(int itemId, int accountId, string password)
+        {
             object[] results = this.Invoke("SetUserPassword", new object[] {
                         itemId,
                         accountId,
                         password});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginSetUserPassword(int itemId, int accountId, string password, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSetUserPassword(int itemId, int accountId, string password, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("SetUserPassword", new object[] {
                         itemId,
                         accountId,
                         password}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndSetUserPassword(System.IAsyncResult asyncResult) {
+        public int EndSetUserPassword(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void SetUserPasswordAsync(int itemId, int accountId, string password) {
+        public void SetUserPasswordAsync(int itemId, int accountId, string password)
+        {
             this.SetUserPasswordAsync(itemId, accountId, password, null);
         }
-        
+
         /// <remarks/>
-        public void SetUserPasswordAsync(int itemId, int accountId, string password, object userState) {
-            if ((this.SetUserPasswordOperationCompleted == null)) {
+        public void SetUserPasswordAsync(int itemId, int accountId, string password, object userState)
+        {
+            if ((this.SetUserPasswordOperationCompleted == null))
+            {
                 this.SetUserPasswordOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetUserPasswordOperationCompleted);
             }
             this.InvokeAsync("SetUserPassword", new object[] {
@@ -1490,17 +1697,20 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         accountId,
                         password}, this.SetUserPasswordOperationCompleted, userState);
         }
-        
-        private void OnSetUserPasswordOperationCompleted(object arg) {
-            if ((this.SetUserPasswordCompleted != null)) {
+
+        private void OnSetUserPasswordOperationCompleted(object arg)
+        {
+            if ((this.SetUserPasswordCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetUserPasswordCompleted(this, new SetUserPasswordCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SearchAccounts", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationUser[] SearchAccounts(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SearchAccounts", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationUser[] SearchAccounts(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes)
+        {
             object[] results = this.Invoke("SearchAccounts", new object[] {
                         itemId,
                         filterColumn,
@@ -1509,9 +1719,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         includeMailboxes});
             return ((OrganizationUser[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginSearchAccounts(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSearchAccounts(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("SearchAccounts", new object[] {
                         itemId,
                         filterColumn,
@@ -1519,21 +1730,25 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         sortColumn,
                         includeMailboxes}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public OrganizationUser[] EndSearchAccounts(System.IAsyncResult asyncResult) {
+        public OrganizationUser[] EndSearchAccounts(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationUser[])(results[0]));
         }
-        
+
         /// <remarks/>
-        public void SearchAccountsAsync(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes) {
+        public void SearchAccountsAsync(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes)
+        {
             this.SearchAccountsAsync(itemId, filterColumn, filterValue, sortColumn, includeMailboxes, null);
         }
-        
+
         /// <remarks/>
-        public void SearchAccountsAsync(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes, object userState) {
-            if ((this.SearchAccountsOperationCompleted == null)) {
+        public void SearchAccountsAsync(int itemId, string filterColumn, string filterValue, string sortColumn, bool includeMailboxes, object userState)
+        {
+            if ((this.SearchAccountsOperationCompleted == null))
+            {
                 this.SearchAccountsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchAccountsOperationCompleted);
             }
             this.InvokeAsync("SearchAccounts", new object[] {
@@ -1543,101 +1758,462 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                         sortColumn,
                         includeMailboxes}, this.SearchAccountsOperationCompleted, userState);
         }
-        
-        private void OnSearchAccountsOperationCompleted(object arg) {
-            if ((this.SearchAccountsCompleted != null)) {
+
+        private void OnSearchAccountsOperationCompleted(object arg)
+        {
+            if ((this.SearchAccountsCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SearchAccountsCompleted(this, new SearchAccountsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteUser", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteUser(int itemId, int accountId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteUser", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteUser(int itemId, int accountId)
+        {
             object[] results = this.Invoke("DeleteUser", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteUser(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginDeleteUser(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("DeleteUser", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public int EndDeleteUser(System.IAsyncResult asyncResult) {
+        public int EndDeleteUser(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void DeleteUserAsync(int itemId, int accountId) {
+        public void DeleteUserAsync(int itemId, int accountId)
+        {
             this.DeleteUserAsync(itemId, accountId, null);
         }
-        
+
         /// <remarks/>
-        public void DeleteUserAsync(int itemId, int accountId, object userState) {
-            if ((this.DeleteUserOperationCompleted == null)) {
+        public void DeleteUserAsync(int itemId, int accountId, object userState)
+        {
+            if ((this.DeleteUserOperationCompleted == null))
+            {
                 this.DeleteUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteUserOperationCompleted);
             }
             this.InvokeAsync("DeleteUser", new object[] {
                         itemId,
                         accountId}, this.DeleteUserOperationCompleted, userState);
         }
-        
-        private void OnDeleteUserOperationCompleted(object arg) {
-            if ((this.DeleteUserCompleted != null)) {
+
+        private void OnDeleteUserOperationCompleted(object arg)
+        {
+            if ((this.DeleteUserCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteUserCompleted(this, new DeleteUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetPasswordPolicy", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public PasswordPolicyResult GetPasswordPolicy(int itemId) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetPasswordPolicy", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public PasswordPolicyResult GetPasswordPolicy(int itemId)
+        {
             object[] results = this.Invoke("GetPasswordPolicy", new object[] {
                         itemId});
             return ((PasswordPolicyResult)(results[0]));
         }
-        
+
         /// <remarks/>
-        public System.IAsyncResult BeginGetPasswordPolicy(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetPasswordPolicy(int itemId, System.AsyncCallback callback, object asyncState)
+        {
             return this.BeginInvoke("GetPasswordPolicy", new object[] {
                         itemId}, callback, asyncState);
         }
-        
+
         /// <remarks/>
-        public PasswordPolicyResult EndGetPasswordPolicy(System.IAsyncResult asyncResult) {
+        public PasswordPolicyResult EndGetPasswordPolicy(System.IAsyncResult asyncResult)
+        {
             object[] results = this.EndInvoke(asyncResult);
             return ((PasswordPolicyResult)(results[0]));
         }
-        
+
         /// <remarks/>
-        public void GetPasswordPolicyAsync(int itemId) {
+        public void GetPasswordPolicyAsync(int itemId)
+        {
             this.GetPasswordPolicyAsync(itemId, null);
         }
-        
+
         /// <remarks/>
-        public void GetPasswordPolicyAsync(int itemId, object userState) {
-            if ((this.GetPasswordPolicyOperationCompleted == null)) {
+        public void GetPasswordPolicyAsync(int itemId, object userState)
+        {
+            if ((this.GetPasswordPolicyOperationCompleted == null))
+            {
                 this.GetPasswordPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPasswordPolicyOperationCompleted);
             }
             this.InvokeAsync("GetPasswordPolicy", new object[] {
                         itemId}, this.GetPasswordPolicyOperationCompleted, userState);
         }
-        
-        private void OnGetPasswordPolicyOperationCompleted(object arg) {
-            if ((this.GetPasswordPolicyCompleted != null)) {
+
+        private void OnGetPasswordPolicyOperationCompleted(object arg)
+        {
+            if ((this.GetPasswordPolicyCompleted != null))
+            {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetPasswordPolicyCompleted(this, new GetPasswordPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-        
+
         /// <remarks/>
-        public new void CancelAsync(object userState) {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateSecurityGroup(int itemId, string displayName, string managedBy)
+        {
+            object[] results = this.Invoke("CreateSecurityGroup", new object[] {
+                    itemId,
+                    displayName,
+                    managedBy});
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateSecurityGroup(int itemId, string displayName, string managedBy, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("CreateSecurityGroup", new object[] {
+                    itemId,
+                    displayName,
+                    managedBy}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public int EndCreateSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public void CreateSecurityGroupAsync(int itemId, string displayName, string managedBy)
+        {
+            this.CreateSecurityGroupAsync(itemId, displayName, managedBy, null);
+        }
+
+        /// <remarks/>
+        public void CreateSecurityGroupAsync(int itemId, string displayName, string managedBy, object userState)
+        {
+            if ((this.CreateSecurityGroupOperationCompleted == null))
+            {
+                this.CreateSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("CreateSecurityGroup", new object[] {
+                    itemId,
+                    displayName,
+                    managedBy}, this.CreateSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnCreateSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.CreateSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateSecurityGroupCompleted(this, new CreateSecurityGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetSecurityGroupGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(int itemId, int accountId)
+        {
+            object[] results = this.Invoke("GetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId});
+            return ((OrganizationSecurityGroup)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSecurityGroupGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("GetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public OrganizationSecurityGroup EndGetSecurityGroupGeneralSettings(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((OrganizationSecurityGroup)(results[0]));
+        }
+
+        /// <remarks/>
+        public void GetSecurityGroupGeneralSettingsAsync(int itemId, int accountId)
+        {
+            this.GetSecurityGroupGeneralSettingsAsync(itemId, accountId, null);
+        }
+
+        /// <remarks/>
+        public void GetSecurityGroupGeneralSettingsAsync(int itemId, int accountId, object userState)
+        {
+            if ((this.GetSecurityGroupGeneralSettingsOperationCompleted == null))
+            {
+                this.GetSecurityGroupGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecurityGroupGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("GetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId}, this.GetSecurityGroupGeneralSettingsOperationCompleted, userState);
+        }
+
+        private void OnGetSecurityGroupGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.GetSecurityGroupGeneralSettingsCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSecurityGroupGeneralSettingsCompleted(this, new GetSecurityGroupGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteSecurityGroup(int itemId, int accountId)
+        {
+            object[] results = this.Invoke("DeleteSecurityGroup", new object[] {
+                    itemId,
+                    accountId});
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteSecurityGroup(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("DeleteSecurityGroup", new object[] {
+                    itemId,
+                    accountId}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public int EndDeleteSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public void DeleteSecurityGroupAsync(int itemId, int accountId)
+        {
+            this.DeleteSecurityGroupAsync(itemId, accountId, null);
+        }
+
+        /// <remarks/>
+        public void DeleteSecurityGroupAsync(int itemId, int accountId, object userState)
+        {
+            if ((this.DeleteSecurityGroupOperationCompleted == null))
+            {
+                this.DeleteSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("DeleteSecurityGroup", new object[] {
+                    itemId,
+                    accountId}, this.DeleteSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnDeleteSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.DeleteSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteSecurityGroupCompleted(this, new DeleteSecurityGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetSecurityGroupGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes)
+        {
+            object[] results = this.Invoke("SetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId,
+                    displayName,
+                    managedBy,
+                    memberAccounts,
+                    notes});
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginSetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("SetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId,
+                    displayName,
+                    managedBy,
+                    memberAccounts,
+                    notes}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public int EndSetSecurityGroupGeneralSettings(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public void SetSecurityGroupGeneralSettingsAsync(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes)
+        {
+            this.SetSecurityGroupGeneralSettingsAsync(itemId, accountId, displayName, managedBy, memberAccounts, notes, null);
+        }
+
+        /// <remarks/>
+        public void SetSecurityGroupGeneralSettingsAsync(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes, object userState)
+        {
+            if ((this.SetSecurityGroupGeneralSettingsOperationCompleted == null))
+            {
+                this.SetSecurityGroupGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetSecurityGroupGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("SetSecurityGroupGeneralSettings", new object[] {
+                    itemId,
+                    accountId,
+                    displayName,
+                    managedBy,
+                    memberAccounts,
+                    notes}, this.SetSecurityGroupGeneralSettingsOperationCompleted, userState);
+        }
+
+        private void OnSetSecurityGroupGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.SetSecurityGroupGeneralSettingsCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetSecurityGroupGeneralSettingsCompleted(this, new SetSecurityGroupGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationSecurityGroupsPaged", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccountsPaged GetOrganizationSecurityGroupsPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
+            object[] results = this.Invoke("GetOrganizationSecurityGroupsPaged", new object[] {
+                    itemId,
+                    filterColumn,
+                    filterValue,
+                    sortColumn,
+                    startRow,
+                    maximumRows});
+            return ((ExchangeAccountsPaged)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginGetOrganizationSecurityGroupsPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("GetOrganizationSecurityGroupsPaged", new object[] {
+                    itemId,
+                    filterColumn,
+                    filterValue,
+                    sortColumn,
+                    startRow,
+                    maximumRows}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public ExchangeAccountsPaged EndGetOrganizationSecurityGroupsPaged(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ExchangeAccountsPaged)(results[0]));
+        }
+
+        /// <remarks/>
+        public void GetOrganizationSecurityGroupsPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
+            this.GetOrganizationSecurityGroupsPagedAsync(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+        }
+
+        /// <remarks/>
+        public void GetOrganizationSecurityGroupsPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
+        {
+            if ((this.GetOrganizationSecurityGroupsPagedOperationCompleted == null))
+            {
+                this.GetOrganizationSecurityGroupsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationSecurityGroupsPagedOperationCompleted);
+            }
+            this.InvokeAsync("GetOrganizationSecurityGroupsPaged", new object[] {
+                    itemId,
+                    filterColumn,
+                    filterValue,
+                    sortColumn,
+                    startRow,
+                    maximumRows}, this.GetOrganizationSecurityGroupsPagedOperationCompleted, userState);
+        }
+
+        private void OnGetOrganizationSecurityGroupsPagedOperationCompleted(object arg)
+        {
+            if ((this.GetOrganizationSecurityGroupsPagedCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetOrganizationSecurityGroupsPagedCompleted(this, new GetOrganizationSecurityGroupsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddUserToSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddUserToSecurityGroup(int itemId, int userAccountId, int groupAccountId)
+        {
+            object[] results = this.Invoke("AddUserToSecurityGroup", new object[] {
+                    itemId,
+                    userAccountId,
+                    groupAccountId});
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginAddUserToSecurityGroup(int itemId, int userAccountId, int groupAccountId, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("AddUserToSecurityGroup", new object[] {
+                    itemId,
+                    userAccountId,
+                    groupAccountId}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public int EndAddUserToSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public void AddUserToSecurityGroupAsync(int itemId, int userAccountId, int groupAccountId)
+        {
+            this.AddUserToSecurityGroupAsync(itemId, userAccountId, groupAccountId, null);
+        }
+
+        /// <remarks/>
+        public void AddUserToSecurityGroupAsync(int itemId, int userAccountId, int groupAccountId, object userState)
+        {
+            if ((this.AddUserToSecurityGroupOperationCompleted == null))
+            {
+                this.AddUserToSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddUserToSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("AddUserToSecurityGroup", new object[] {
+                    itemId,
+                    userAccountId,
+                    groupAccountId}, this.AddUserToSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnAddUserToSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.AddUserToSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddUserToSecurityGroupCompleted(this, new AddUserToSecurityGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        public new void CancelAsync(object userState)
+        {
             base.CancelAsync(userState);
         }
     }
@@ -1671,654 +2247,934 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void CreateOrganizationCompletedEventHandler(object sender, CreateOrganizationCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class CreateOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal CreateOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal CreateOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetRawOrganizationsPagedCompletedEventHandler(object sender, GetRawOrganizationsPagedCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetRawOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetRawOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetRawOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetRawOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public System.Data.DataSet Result {
-            get {
+        public System.Data.DataSet Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((System.Data.DataSet)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationsCompletedEventHandler(object sender, GetOrganizationsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public Organization[] Result {
-            get {
+        public Organization[] Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((Organization[])(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationUserSummuryLetterCompletedEventHandler(object sender, GetOrganizationUserSummuryLetterCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationUserSummuryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationUserSummuryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationUserSummuryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationUserSummuryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public string Result {
-            get {
+        public string Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((string)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SendOrganizationUserSummuryLetterCompletedEventHandler(object sender, SendOrganizationUserSummuryLetterCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SendOrganizationUserSummuryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SendOrganizationUserSummuryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SendOrganizationUserSummuryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SendOrganizationUserSummuryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void DeleteOrganizationCompletedEventHandler(object sender, DeleteOrganizationCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class DeleteOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal DeleteOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal DeleteOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationStatisticsCompletedEventHandler(object sender, GetOrganizationStatisticsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationStatistics Result {
-            get {
+        public OrganizationStatistics Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationStatistics)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationStatisticsByOrganizationCompletedEventHandler(object sender, GetOrganizationStatisticsByOrganizationCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationStatisticsByOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationStatisticsByOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationStatisticsByOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationStatisticsByOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationStatistics Result {
-            get {
+        public OrganizationStatistics Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationStatistics)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationCompletedEventHandler(object sender, GetOrganizationCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public Organization Result {
-            get {
+        public Organization Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((Organization)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetAccountIdByUserPrincipalNameCompletedEventHandler(object sender, GetAccountIdByUserPrincipalNameCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetAccountIdByUserPrincipalNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetAccountIdByUserPrincipalNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetAccountIdByUserPrincipalNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetAccountIdByUserPrincipalNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void AddOrganizationDomainCompletedEventHandler(object sender, AddOrganizationDomainCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddOrganizationDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class AddOrganizationDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal AddOrganizationDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal AddOrganizationDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void ChangeOrganizationDomainTypeCompletedEventHandler(object sender, ChangeOrganizationDomainTypeCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ChangeOrganizationDomainTypeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class ChangeOrganizationDomainTypeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal ChangeOrganizationDomainTypeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal ChangeOrganizationDomainTypeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationDomainsCompletedEventHandler(object sender, GetOrganizationDomainsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationDomainsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationDomainsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationDomainsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationDomainsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationDomainName[] Result {
-            get {
+        public OrganizationDomainName[] Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationDomainName[])(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void DeleteOrganizationDomainCompletedEventHandler(object sender, DeleteOrganizationDomainCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteOrganizationDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class DeleteOrganizationDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal DeleteOrganizationDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal DeleteOrganizationDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetOrganizationDefaultDomainCompletedEventHandler(object sender, SetOrganizationDefaultDomainCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetOrganizationDefaultDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SetOrganizationDefaultDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SetOrganizationDefaultDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SetOrganizationDefaultDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void CreateUserCompletedEventHandler(object sender, CreateUserCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class CreateUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal CreateUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal CreateUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void ImportUserCompletedEventHandler(object sender, ImportUserCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ImportUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class ImportUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal ImportUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal ImportUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetOrganizationUsersPagedCompletedEventHandler(object sender, GetOrganizationUsersPagedCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationUsersPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetOrganizationUsersPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetOrganizationUsersPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetOrganizationUsersPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationUsersPaged Result {
-            get {
+        public OrganizationUsersPaged Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationUsersPaged)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetUserGeneralSettingsCompletedEventHandler(object sender, GetUserGeneralSettingsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetUserGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetUserGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetUserGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetUserGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationUser Result {
-            get {
+        public OrganizationUser Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationUser)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetUserGeneralSettingsCompletedEventHandler(object sender, SetUserGeneralSettingsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetUserGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SetUserGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SetUserGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SetUserGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetUserPrincipalNameCompletedEventHandler(object sender, SetUserPrincipalNameCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetUserPrincipalNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SetUserPrincipalNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SetUserPrincipalNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SetUserPrincipalNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetUserPasswordCompletedEventHandler(object sender, SetUserPasswordCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetUserPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SetUserPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SetUserPasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SetUserPasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SearchAccountsCompletedEventHandler(object sender, SearchAccountsCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SearchAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class SearchAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal SearchAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal SearchAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public OrganizationUser[] Result {
-            get {
+        public OrganizationUser[] Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationUser[])(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void DeleteUserCompletedEventHandler(object sender, DeleteUserCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class DeleteUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal DeleteUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal DeleteUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public int Result {
-            get {
+        public int Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetPasswordPolicyCompletedEventHandler(object sender, GetPasswordPolicyCompletedEventArgs e);
-    
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPasswordPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
+    public partial class GetPasswordPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
         private object[] results;
-        
-        internal GetPasswordPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
+
+        internal GetPasswordPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
             this.results = results;
         }
-        
+
         /// <remarks/>
-        public PasswordPolicyResult Result {
-            get {
+        public PasswordPolicyResult Result
+        {
+            get
+            {
                 this.RaiseExceptionIfNecessary();
                 return ((PasswordPolicyResult)(this.results[0]));
             }
         }
     }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void CreateSecurityGroupCompletedEventHandler(object sender, CreateSecurityGroupCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateSecurityGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal CreateSecurityGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public int Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetSecurityGroupGeneralSettingsCompletedEventHandler(object sender, GetSecurityGroupGeneralSettingsCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSecurityGroupGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal GetSecurityGroupGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public OrganizationSecurityGroup Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((OrganizationSecurityGroup)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void DeleteSecurityGroupCompletedEventHandler(object sender, DeleteSecurityGroupCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteSecurityGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal DeleteSecurityGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public int Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetSecurityGroupGeneralSettingsCompletedEventHandler(object sender, SetSecurityGroupGeneralSettingsCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetSecurityGroupGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal SetSecurityGroupGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public int Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetOrganizationSecurityGroupsPagedCompletedEventHandler(object sender, GetOrganizationSecurityGroupsPagedCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetOrganizationSecurityGroupsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal GetOrganizationSecurityGroupsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public ExchangeAccountsPaged Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((ExchangeAccountsPaged)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void AddUserToSecurityGroupCompletedEventHandler(object sender, AddUserToSecurityGroupCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddUserToSecurityGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal AddUserToSecurityGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public int Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 95d5da6f..9f87df13 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -371,6 +371,11 @@ namespace WebsitePanel.EnterpriseServer
 				// register domain                
 				DataProvider.AddExchangeOrganizationDomain(itemId, domainId, true);
 
+                //add to exchangeAcounts
+                AddAccount(itemId, ExchangeAccountType.DefaultSecurityGroup, org.GroupName,
+                                org.GroupName, null, false,
+                                0, org.GroupName, null, 0, null);
+
 				// register organization domain service item
 				OrganizationDomain orgDomain = new OrganizationDomain
 				                                   {
@@ -1717,7 +1722,7 @@ namespace WebsitePanel.EnterpriseServer
 
             return (account);
         }
-       
+
         public static int SetUserGeneralSettings(int itemId, int accountId, string displayName,
             string password, bool hideAddressBook, bool disabled, bool locked, string firstName, string initials,
             string lastName, string address, string city, string state, string zip, string country,
@@ -2196,6 +2201,339 @@ namespace WebsitePanel.EnterpriseServer
             return ocs;
         }
 
+        private static int AddAccount(int itemId, ExchangeAccountType accountType,
+            string accountName, string displayName, string primaryEmailAddress, bool mailEnabledPublicFolder,
+            MailboxManagerActions mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId, string subscriberNumber)
+        {
+            return DataProvider.AddExchangeAccount(itemId, (int)accountType,
+                accountName, displayName, primaryEmailAddress, mailEnabledPublicFolder,
+                mailboxManagerActions.ToString(), samAccountName, CryptoUtils.Encrypt(accountPassword), mailboxPlanId, (string.IsNullOrEmpty(subscriberNumber) ? null : subscriberNumber.Trim()));
+        }
+
+        public static int CreateSecurityGroup(int itemId, string displayName, string managedBy)
+        {
+            if (string.IsNullOrEmpty(displayName))
+                throw new ArgumentNullException("displayName");
+
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0) return accountCheck;
+
+
+            // place log record
+            TaskManager.StartTask("ORGANIZATION", "CREATE_SECURITY_GROUP", itemId);
+
+            TaskManager.Write("Organization ID :" + itemId);
+            TaskManager.Write("display name :" + displayName);
+
+            int securityGroupId = -1;
+
+            try
+            {
+                displayName = displayName.Trim();
+
+                // load organization
+                Organization org = GetOrganization(itemId);
+
+                if (org == null)
+                {
+                    return -1;
+                }
+
+                StringDictionary serviceSettings = ServerController.GetServiceSettings(org.ServiceId);
+
+                if (serviceSettings == null)
+                {
+                    return -1;
+                }
+
+                // check package
+                int packageCheck = SecurityContext.CheckPackage(org.PackageId, DemandPackage.IsActive);
+                if (packageCheck < 0) return packageCheck;
+
+                int errorCode;
+                if (!CheckUserQuota(org.Id, out errorCode))
+                    return errorCode;
+
+                Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
+
+                TaskManager.Write("accountName :" + displayName);
+
+                if (orgProxy.CreateSecurityGroup(org.OrganizationId, displayName, managedBy) == 0)
+                {
+                    OrganizationSecurityGroup retSecurityGroup = orgProxy.GetSecurityGroupGeneralSettings(displayName, org.OrganizationId);
+                    TaskManager.Write("sAMAccountName :" + retSecurityGroup.SAMAccountName);
+
+                    securityGroupId = AddAccount(itemId, ExchangeAccountType.SecurityGroup, displayName,
+                                                    displayName, null, false,
+                                                    0, retSecurityGroup.SAMAccountName, null, 0, null);
+                }
+                else
+                {
+                    TaskManager.WriteError("Failed to create securitygroup");
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+
+            return securityGroupId;
+        }
+
+        private static OrganizationSecurityGroup GetDemoSecurityGroupGeneralSettings()
+        {
+            OrganizationSecurityGroup c = new OrganizationSecurityGroup();
+            c.DisplayName = "Fabrikam Sales";
+            c.AccountName = "sales_fabrikam";
+
+            return c;
+        }
+
+        public static OrganizationSecurityGroup GetSecurityGroupGeneralSettings(int itemId, int accountId)
+        {
+            #region Demo Mode
+            if (IsDemoMode)
+            {
+                return GetDemoSecurityGroupGeneralSettings();
+            }
+            #endregion
+
+            // place log record
+            TaskManager.StartTask("ORGANIZATION", "GET_SECURITY_GROUP_GENERAL", itemId);
+
+            try
+            {
+                // load organization
+                Organization org = GetOrganization(itemId);
+                if (org == null)
+                    return null;
+
+                OrganizationUser account = GetAccount(itemId, accountId);
+
+                // get mailbox settings
+                Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
+
+                OrganizationSecurityGroup securityGroup = orgProxy.GetSecurityGroupGeneralSettings(account.AccountName, org.OrganizationId);
+
+                securityGroup.DisplayName = account.DisplayName;
+
+                securityGroup.IsDefault = account.AccountType == ExchangeAccountType.DefaultSecurityGroup;
+
+                foreach (OrganizationUser user in securityGroup.MembersAccounts)
+                {
+                    OrganizationUser userAccount = GetAccountByAccountName(itemId, user.SamAccountName);
+
+                    user.AccountId = userAccount.AccountId;
+                    user.AccountName = userAccount.AccountName;
+                    user.PrimaryEmailAddress = userAccount.PrimaryEmailAddress;
+                    user.AccountType = userAccount.AccountType;
+                }
+
+                return securityGroup;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        public static int DeleteSecurityGroup(int itemId, int accountId)
+        {
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0) return accountCheck;
+
+            // place log record
+            TaskManager.StartTask("ORGANIZATION", "DELETE_SECURITY_GROUP", itemId);
+
+            try
+            {
+                // load organization
+                Organization org = GetOrganization(itemId);
+                if (org == null)
+                    return -1;
+
+                // load account
+                ExchangeAccount account = ExchangeServerController.GetAccount(itemId, accountId);
+
+                Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
+
+                orgProxy.DeleteSecurityGroup(account.AccountName, org.OrganizationId);
+                
+                DeleteUserFromMetabase(itemId, accountId);
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        public static int SetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes)
+        {
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0) return accountCheck;
+
+            // place log record
+            TaskManager.StartTask("ORGANIZATION", "UPDATE_SECURITY_GROUP_GENERAL", itemId);
+
+            try
+            {
+                displayName = displayName.Trim();
+
+                // load organization
+                Organization org = GetOrganization(itemId);
+                if (org == null)
+                    return -1;
+
+                // check package
+                int packageCheck = SecurityContext.CheckPackage(org.PackageId, DemandPackage.IsActive);
+                if (packageCheck < 0) return packageCheck;
+
+                // load account
+                ExchangeAccount account = ExchangeServerController.GetAccount(itemId, accountId);
+
+                string accountName = GetAccountName(account.AccountName);
+                // get mailbox settings
+                Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
+                // external email
+
+                orgProxy.SetSecurityGroupGeneralSettings(
+                    org.OrganizationId,
+                    accountName,
+                    managedBy,
+                    memberAccounts,
+                    notes);
+
+                // update account
+                account.DisplayName = displayName;
+
+                UpdateAccount(account);
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        public static ExchangeAccountsPaged GetOrganizationSecurityGroupsPaged(int itemId, string filterColumn, string filterValue, string sortColumn,
+            int startRow, int maximumRows)
+        {
+
+            #region Demo Mode
+            if (IsDemoMode)
+            {
+                ExchangeAccountsPaged res = new ExchangeAccountsPaged();
+                List<ExchangeAccount> demoSecurityGroups = new List<ExchangeAccount>();
+
+                ExchangeAccount r1 = new ExchangeAccount();
+                r1.AccountId = 20;
+                r1.AccountName = "group1_fabrikam";
+                r1.AccountType = ExchangeAccountType.SecurityGroup;
+                r1.DisplayName = "Group 1";
+                demoSecurityGroups.Add(r1);
+
+                ExchangeAccount r2 = new ExchangeAccount();
+                r1.AccountId = 21;
+                r1.AccountName = "group2_fabrikam";
+                r1.AccountType = ExchangeAccountType.SecurityGroup;
+                r1.DisplayName = "Group 2";
+                demoSecurityGroups.Add(r2);
+
+
+                res.PageItems = demoSecurityGroups.ToArray();
+                res.RecordsCount = res.PageItems.Length;
+                
+                return res;
+            }
+            #endregion
+
+            string accountTypes = string.Format("{0}, {1}", ((int)ExchangeAccountType.SecurityGroup), ((int)ExchangeAccountType.DefaultSecurityGroup));
+
+            DataSet ds =
+                DataProvider.GetExchangeAccountsPaged(SecurityContext.User.UserId, itemId, accountTypes, filterColumn,
+                                                      filterValue, sortColumn, startRow, maximumRows);
+
+            ExchangeAccountsPaged result = new ExchangeAccountsPaged();
+            result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
+
+            List<ExchangeAccount> Tmpaccounts = new List<ExchangeAccount>();
+            ObjectUtils.FillCollectionFromDataView(Tmpaccounts, ds.Tables[1].DefaultView);
+            result.PageItems = Tmpaccounts.ToArray();
+
+            List<ExchangeAccount> accounts = new List<ExchangeAccount>();
+
+            foreach (ExchangeAccount account in Tmpaccounts.ToArray())
+            {
+                OrganizationSecurityGroup tmpSecurityGroup = GetSecurityGroupGeneralSettings(itemId, account.AccountId);
+
+                if (tmpSecurityGroup != null)
+                    accounts.Add(account);
+            }
+
+            result.PageItems = accounts.ToArray();
+
+            return result;
+        }
+
+        public static int AddUserToSecurityGroup(int itemId, int userAccountId, int groupAccountId)
+        {
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0) return accountCheck;
+
+            // place log record
+            TaskManager.StartTask("ORGANIZATION", "ADD_USER_TO_SECURITY_GROUP", itemId);
+
+            try
+            {
+                // load organization
+                Organization org = GetOrganization(itemId);
+                if (org == null)
+                    return -1;
+
+                // load user account
+                OrganizationUser userAccount = GetAccount(itemId, userAccountId);
+
+                //load group account
+                ExchangeAccount groupAccount = ExchangeServerController.GetAccount(itemId, groupAccountId);
+
+                Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
+
+                orgProxy.AddUserToSecurityGroup(org.OrganizationId, userAccount.AccountName, groupAccount.AccountName);
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
     }
     
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
index ac5a1e38..6d632462 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
@@ -242,5 +242,46 @@ namespace WebsitePanel.EnterpriseServer
 
         #endregion
 
+        #region Security Groups
+
+        [WebMethod]
+        public int CreateSecurityGroup(int itemId, string displayName, string managedBy)
+        {
+            return OrganizationController.CreateSecurityGroup(itemId, displayName, managedBy);
+        }
+
+        [WebMethod]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(int itemId, int accountId)
+        {
+            return OrganizationController.GetSecurityGroupGeneralSettings(itemId, accountId);
+        }
+
+        [WebMethod]
+        public int DeleteSecurityGroup(int itemId, int accountId)
+        {
+            return OrganizationController.DeleteSecurityGroup(itemId, accountId);
+        }
+
+        [WebMethod]
+        public int SetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes)
+        {
+            return OrganizationController.SetSecurityGroupGeneralSettings(itemId, accountId, displayName, managedBy, memberAccounts, notes);
+        }
+
+        [WebMethod]
+        public ExchangeAccountsPaged GetOrganizationSecurityGroupsPaged(int itemId, string filterColumn, string filterValue, string sortColumn,
+            int startRow, int maximumRows)
+        {
+            return OrganizationController.GetOrganizationSecurityGroupsPaged(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
+        }
+
+        [WebMethod]
+        public int AddUserToSecurityGroup(int itemId, int userAccountId, int groupAccountId)
+        {
+            return OrganizationController.AddUserToSecurityGroup(itemId, userAccountId, groupAccountId);
+        }
+
+        #endregion
+
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs
index 9ef289cb..c53441a1 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs
@@ -61,6 +61,7 @@ namespace WebsitePanel.Providers.HostedSolution
 		public const string ExternalEmail = "mail";
         public const string CustomAttribute2 = "extensionAttribute2";
         public const string DistinguishedName = "distinguishedName";
+        public const string ManagedBy = "ManagedBy";
 
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
index 99703719..773afad4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
@@ -44,6 +44,35 @@ namespace WebsitePanel.Providers.HostedSolution
             return de;
         }
 
+        public static string[] GetUsersGroup(string group)
+        {
+            List<string> rets = new List<string>();
+
+            DirectorySearcher deSearch = new DirectorySearcher
+            {
+                Filter =
+                    ("(&(objectClass=user))")
+            };
+
+            SearchResultCollection srcUsers = deSearch.FindAll();
+
+            foreach (SearchResult srcUser in srcUsers)
+            {
+                DirectoryEntry de = srcUser.GetDirectoryEntry();
+                PropertyValueCollection props = de.Properties["memberOf"];
+
+                foreach (string str in props)
+                {
+                    if (str.IndexOf(group) != -1)
+                    {
+                        rets.Add(de.Path);
+                    }
+                }
+            }
+
+            return rets.ToArray();
+        }
+
         public static bool IsUserInGroup(string samAccountName, string group)
         {
             bool res = false;
@@ -328,6 +357,7 @@ namespace WebsitePanel.Providers.HostedSolution
             newGroupObject.Properties[ADAttributes.SAMAccountName].Add(group);
 
             newGroupObject.Properties[ADAttributes.GroupType].Add(-2147483640);
+
             newGroupObject.CommitChanges();
         }
 
@@ -339,6 +369,14 @@ namespace WebsitePanel.Providers.HostedSolution
             group.Invoke("Add", user.Path);
         }
 
+        public static void RemoveUserFromGroup(string userPath, string groupPath)
+        {
+            DirectoryEntry user = new DirectoryEntry(userPath);
+            DirectoryEntry group = new DirectoryEntry(groupPath);
+
+            group.Invoke("Remove", user.Path);
+        }
+
         public static bool AdObjectExists(string path)
         {
             return DirectoryEntry.Exists(path);
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccountType.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccountType.cs
index a72ef690..c8e3c3da 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccountType.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccountType.cs
@@ -37,7 +37,9 @@ namespace WebsitePanel.Providers.HostedSolution
 		PublicFolder = 4,
 		Room = 5,
 		Equipment = 6,
-        User = 7
+        User = 7,
+        SecurityGroup = 8,
+        DefaultSecurityGroup = 9
 
 	}
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
index 6da1e71a..bda213b7 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
@@ -42,6 +42,16 @@ namespace WebsitePanel.Providers.HostedSolution
 
         OrganizationUser GetUserGeneralSettings(string loginName, string organizationId);
 
+        int CreateSecurityGroup(string organizationId, string groupName, string managedBy);
+
+        OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId);
+
+        void DeleteSecurityGroup(string groupName, string organizationId);
+
+        void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes);
+
+        void AddUserToSecurityGroup(string organizationId, string loginName, string groupName);
+
         void SetUserGeneralSettings(string organizationId, string accountName, string displayName, string password,
                                     bool hideFromAddressBook, bool disabled, bool locked, string firstName, string initials,
                                     string lastName,
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs
new file mode 100644
index 00000000..52afb68c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.Providers.HostedSolution
+{
+    public class OrganizationSecurityGroup
+    {
+        public string DisplayName
+        {
+            get;
+            set;
+        }
+
+        public string AccountName
+        {
+            get;
+            set;
+        }
+
+        public OrganizationUser[] MembersAccounts
+        {
+            get;
+            set;
+        }
+
+        public OrganizationUser ManagerAccount
+        {
+            get;
+            set;
+        }
+
+        public string Notes
+        {
+            get;
+            set;
+        }
+
+        public string SAMAccountName
+        {
+            get;
+            set;
+        }
+
+        public bool IsDefault
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
index 1e1c8954..2fb310a5 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
@@ -102,6 +102,7 @@
     <Compile Include="HostedSolution\LyncUserPlanType.cs" />
     <Compile Include="HostedSolution\LyncUsersPaged.cs" />
     <Compile Include="HostedSolution\LyncVoicePolicyType.cs" />
+    <Compile Include="HostedSolution\OrganizationSecurityGroup.cs" />
     <Compile Include="HostedSolution\TransactionAction.cs" />
     <Compile Include="ResultObjects\HeliconApe.cs" />
     <Compile Include="HostedSolution\ExchangeMobileDevice.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
index 53689f1d..f1cab4d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
@@ -27,10 +27,10 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
+using System.Collections.Generic;
 using System.DirectoryServices;
 using System.Globalization;
 using System.Text;
-
 using WebsitePanel.Providers.Common;
 using WebsitePanel.Providers.ResultObjects;
 
@@ -102,6 +102,20 @@ namespace WebsitePanel.Providers.HostedSolution
             return sb.ToString();
         }
 
+        private string GetGroupPath(string organizationId, string groupName)
+        {
+            StringBuilder sb = new StringBuilder();
+            // append provider
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendCNPath(sb, groupName);
+            AppendOUPath(sb, organizationId);
+            AppendOUPath(sb, RootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        }
+
         private string GetRootOU()
         {
             StringBuilder sb = new StringBuilder();
@@ -213,6 +227,7 @@ namespace WebsitePanel.Providers.HostedSolution
                 org.OrganizationId = organizationId;
                 org.DistinguishedName = ActiveDirectoryUtils.RemoveADPrefix(orgPath);
                 org.SecurityGroup = ActiveDirectoryUtils.RemoveADPrefix(GetGroupPath(organizationId));
+                org.GroupName = organizationId;
             }
             catch (Exception ex)
             {
@@ -498,10 +513,19 @@ namespace WebsitePanel.Providers.HostedSolution
                 throw new ArgumentNullException("loginName");
 
             string path = GetUserPath(organizationId, loginName);
-            DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
 
+            OrganizationUser retUser = GetUser(path);
+
+            HostedSolutionLog.LogEnd("GetUserGeneralSettingsInternal");
+            return retUser;
+        }
+
+        private OrganizationUser GetUser(string path)
+        {
             OrganizationUser retUser = new OrganizationUser();
 
+            DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
+
             retUser.FirstName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.FirstName);
             retUser.LastName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.LastName);
             retUser.DisplayName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.DisplayName);
@@ -524,14 +548,13 @@ namespace WebsitePanel.Providers.HostedSolution
             retUser.Notes = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.Notes);
             retUser.ExternalEmail = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.ExternalEmail);
             retUser.Disabled = (bool)entry.InvokeGet(ADAttributes.AccountDisabled);
-            retUser.Manager = GetManager(entry);
+            retUser.Manager = GetManager(entry, ADAttributes.Manager);
             retUser.SamAccountName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.SAMAccountName);
             retUser.DomainUserName = GetDomainName(ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.SAMAccountName));
             retUser.DistinguishedName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.DistinguishedName);
             retUser.Locked = (bool)entry.InvokeGet(ADAttributes.AccountLocked);
-            retUser.UserPrincipalName= (string)entry.InvokeGet(ADAttributes.UserPrincipalName);
+            retUser.UserPrincipalName = (string)entry.InvokeGet(ADAttributes.UserPrincipalName);
 
-            HostedSolutionLog.LogEnd("GetUserGeneralSettingsInternal");
             return retUser;
         }
 
@@ -542,10 +565,10 @@ namespace WebsitePanel.Providers.HostedSolution
             return ret;
         }
 
-        private OrganizationUser GetManager(DirectoryEntry entry)
+        private OrganizationUser GetManager(DirectoryEntry entry, string adAttribute)
         {
             OrganizationUser retUser = null;
-            string path = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.Manager);
+            string path = ActiveDirectoryUtils.GetADObjectStringProperty(entry, adAttribute);
             if (!string.IsNullOrEmpty(path))
             {
                 path = ActiveDirectoryUtils.AddADPrefix(path, PrimaryDomainController);
@@ -800,6 +823,226 @@ namespace WebsitePanel.Providers.HostedSolution
         }
         #endregion
 
+        #region Security Groups
+
+        public int CreateSecurityGroup(string organizationId, string groupName, string managedBy)
+        {
+            return CreateSecurityGroupInternal(organizationId, groupName, managedBy);
+        }
+
+        internal int CreateSecurityGroupInternal(string organizationId, string groupName, string managedBy)
+        {
+            HostedSolutionLog.LogStart("CreateSecurityGroupInternal");
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+            HostedSolutionLog.DebugInfo("groupName : {0}", groupName);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            if (string.IsNullOrEmpty(groupName))
+                throw new ArgumentNullException("groupName");
+
+            bool groupCreated = false;
+            string groupPath = null;
+            try
+            {
+                string path = GetOrganizationPath(organizationId);
+                groupPath = GetGroupPath(organizationId, groupName);
+                
+                if (!ActiveDirectoryUtils.AdObjectExists(groupPath))
+                {
+                    ActiveDirectoryUtils.CreateGroup(path, groupName);
+
+                    DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(groupPath);
+
+                    string manager = string.Empty;
+                    if (!string.IsNullOrEmpty(managedBy))
+                    {
+                        string managerPath = GetUserPath(organizationId, managedBy);
+                        manager = ActiveDirectoryUtils.AdObjectExists(managerPath) ? managerPath : string.Empty;
+                    }
+
+                    ActiveDirectoryUtils.SetADObjectProperty(entry, ADAttributes.ManagedBy, ActiveDirectoryUtils.RemoveADPrefix(manager));
+
+                    entry.CommitChanges();
+
+                    groupCreated = true;
+                    
+                    HostedSolutionLog.DebugInfo("Security Group created: {0}", groupName);
+                }
+                else
+                {
+                    HostedSolutionLog.DebugInfo("AD_OBJECT_ALREADY_EXISTS: {0}", groupPath);
+                    HostedSolutionLog.LogEnd("CreateSecurityGroupInternal");
+
+                    return Errors.AD_OBJECT_ALREADY_EXISTS;
+                }
+            }
+            catch (Exception e)
+            {
+                HostedSolutionLog.LogError(e);
+                try
+                {
+                    if (groupCreated)
+                        ActiveDirectoryUtils.DeleteADObject(groupPath);
+                }
+                catch (Exception ex)
+                {
+                    HostedSolutionLog.LogError(ex);
+                }
+
+                return Errors.AD_OBJECT_ALREADY_EXISTS;
+            }
+
+            HostedSolutionLog.LogEnd("CreateSecurityGroupInternal");
+
+            return Errors.OK;
+        }
+
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId)
+        {
+            return GetSecurityGroupGeneralSettingsInternal(groupName, organizationId);
+        }
+
+        internal OrganizationSecurityGroup GetSecurityGroupGeneralSettingsInternal(string groupName, string organizationId)
+        {
+            HostedSolutionLog.LogStart("GetSecurityGroupGeneralSettingsInternal");
+            HostedSolutionLog.DebugInfo("groupName : {0}", groupName);
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            if (string.IsNullOrEmpty(groupName))
+                throw new ArgumentNullException("groupName");
+
+            string path = GetGroupPath(organizationId, groupName);
+
+            DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
+
+            OrganizationSecurityGroup securityGroup = new OrganizationSecurityGroup();
+
+            securityGroup.ManagerAccount = GetManager(entry, ADAttributes.ManagedBy);
+
+            securityGroup.Notes = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.Notes);
+            
+            securityGroup.AccountName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.SAMAccountName);
+            securityGroup.SAMAccountName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.SAMAccountName);
+
+            List<OrganizationUser> members = new List<OrganizationUser>();
+
+            foreach (string userPath in ActiveDirectoryUtils.GetUsersGroup(groupName))
+            {
+                members.Add(GetUser(userPath));
+            }
+
+            securityGroup.MembersAccounts = members.ToArray();
+
+            HostedSolutionLog.LogEnd("GetSecurityGroupGeneralSettingsInternal");
+
+            return securityGroup;
+        }
+
+        public void DeleteSecurityGroup(string groupName, string organizationId)
+        {
+            DeleteSecurityGroupInternal(groupName, organizationId);
+        }
+
+        internal void DeleteSecurityGroupInternal(string groupName, string organizationId)
+        {
+            HostedSolutionLog.LogStart("DeleteSecurityGroupInternal");
+            HostedSolutionLog.DebugInfo("groupName : {0}", groupName);
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            if (string.IsNullOrEmpty(groupName))
+                throw new ArgumentNullException("groupName");
+
+            string path = GetGroupPath(organizationId, groupName);
+
+            if (ActiveDirectoryUtils.AdObjectExists(path))
+                ActiveDirectoryUtils.DeleteADObject(path, true);
+
+            HostedSolutionLog.LogEnd("DeleteSecurityGroupInternal");
+        }
+
+        public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
+        {
+            
+            SetSecurityGroupGeneralSettingsInternal(organizationId, groupName, managedBy, memberAccounts, notes);
+        }
+
+        internal void SetSecurityGroupGeneralSettingsInternal(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
+        {
+            HostedSolutionLog.LogStart("SetSecurityGroupGeneralSettingsInternal");
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+            HostedSolutionLog.DebugInfo("groupName : {0}", groupName);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            if (string.IsNullOrEmpty(groupName))
+                throw new ArgumentNullException("groupName");
+
+            string path = GetGroupPath(organizationId, groupName);
+
+            DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
+
+            string manager = string.Empty;
+            if (!string.IsNullOrEmpty(managedBy))
+            {
+                string managerPath = GetUserPath(organizationId, managedBy);
+                manager = ActiveDirectoryUtils.AdObjectExists(managerPath) ? managerPath : string.Empty;
+            }
+
+            ActiveDirectoryUtils.SetADObjectProperty(entry, ADAttributes.ManagedBy, ActiveDirectoryUtils.RemoveADPrefix(manager));
+
+            ActiveDirectoryUtils.SetADObjectProperty(entry, ADAttributes.Notes, notes);
+
+            foreach(string userPath in ActiveDirectoryUtils.GetUsersGroup(groupName)) {
+                ActiveDirectoryUtils.RemoveUserFromGroup(userPath, path);
+            }
+
+            foreach(string user in memberAccounts) {
+                string userPath = GetUserPath(organizationId, user);
+                ActiveDirectoryUtils.AddUserToGroup(userPath, path);
+            }
+            
+            entry.CommitChanges();
+        }
+
+        public void AddUserToSecurityGroup(string organizationId, string loginName, string groupName)
+        {
+            AddUserToSecurityGroupInternal(organizationId, loginName, groupName);
+        }
+
+        internal void AddUserToSecurityGroupInternal(string organizationId, string loginName, string groupName)
+        {
+            HostedSolutionLog.LogStart("AddUserToSecurityGroupInternal");
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+            HostedSolutionLog.DebugInfo("loginName : {0}", loginName);
+            HostedSolutionLog.DebugInfo("groupName : {0}", groupName);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            if (string.IsNullOrEmpty(loginName))
+                throw new ArgumentNullException("loginName");
+
+            if (string.IsNullOrEmpty(groupName))
+                throw new ArgumentNullException("groupName");
+
+            string userPath = GetUserPath(organizationId, loginName);
+
+            string groupPath = GetGroupPath(organizationId, groupName);
+
+            ActiveDirectoryUtils.AddUserToGroup(userPath, groupPath);
+        }
+
+        #endregion
+
         public override bool IsInstalled()
         {
             return Environment.UserDomainName != Environment.MachineName;
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
index eb607e66..b01c7dc4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
@@ -77,6 +77,16 @@ namespace WebsitePanel.Providers.HostedSolution
 
         private System.Threading.SendOrPostCallback GetUserGeneralSettingsOperationCompleted;
 
+        private System.Threading.SendOrPostCallback CreateSecurityGroupOperationCompleted;
+
+        private System.Threading.SendOrPostCallback GetSecurityGroupGeneralSettingsOperationCompleted;
+
+        private System.Threading.SendOrPostCallback DeleteSecurityGroupOperationCompleted;
+
+        private System.Threading.SendOrPostCallback SetSecurityGroupGeneralSettingsOperationCompleted;
+
+        private System.Threading.SendOrPostCallback AddUserToSecurityGroupOperationCompleted;
+
         private System.Threading.SendOrPostCallback SetUserGeneralSettingsOperationCompleted;
 
         private System.Threading.SendOrPostCallback SetUserPasswordOperationCompleted;
@@ -117,6 +127,21 @@ namespace WebsitePanel.Providers.HostedSolution
         /// <remarks/>
         public event GetUserGeneralSettingsCompletedEventHandler GetUserGeneralSettingsCompleted;
 
+        /// <remarks/>
+        public event CreateSecurityGroupCompletedEventHandler CreateSecurityGroupCompleted;
+
+        /// <remarks/>
+        public event GetSecurityGroupGeneralSettingsCompletedEventHandler GetSecurityGroupGeneralSettingsCompleted;
+
+        /// <remarks/>
+        public event DeleteSecurityGroupCompletedEventHandler DeleteSecurityGroupCompleted;
+
+        /// <remarks/>
+        public event SetSecurityGroupGeneralSettingsCompletedEventHandler SetSecurityGroupGeneralSettingsCompleted;
+
+        /// <remarks/>
+        public event AddUserToSecurityGroupCompletedEventHandler AddUserToSecurityGroupCompleted;
+
         /// <remarks/>
         public event SetUserGeneralSettingsCompletedEventHandler SetUserGeneralSettingsCompleted;
 
@@ -458,6 +483,280 @@ namespace WebsitePanel.Providers.HostedSolution
             }
         }
 
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateSecurityGroup(string organizationId, string groupName, string managedBy)
+        {
+            object[] results = this.Invoke("CreateSecurityGroup", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy});
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateSecurityGroup(string organizationId, string groupName, string managedBy, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("CreateSecurityGroup", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public int EndCreateSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+
+        /// <remarks/>
+        public void CreateSecurityGroupAsync(string organizationId, string groupName, string managedBy)
+        {
+            this.CreateSecurityGroupAsync(organizationId, groupName, managedBy, null);
+        }
+
+        /// <remarks/>
+        public void CreateSecurityGroupAsync(string organizationId, string groupName, string managedBy, object userState)
+        {
+            if ((this.CreateSecurityGroupOperationCompleted == null))
+            {
+                this.CreateSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("CreateSecurityGroup", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy}, this.CreateSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnCreateSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.CreateSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateSecurityGroupCompleted(this, new CreateSecurityGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetSecurityGroupGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId)
+        {
+            object[] results = this.Invoke("GetSecurityGroupGeneralSettings", new object[] {
+                    groupName,
+                    organizationId});
+            return ((OrganizationSecurityGroup)(results[0]));
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSecurityGroupGeneralSettings(string groupName, string organizationId, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("GetSecurityGroupGeneralSettings", new object[] {
+                    groupName,
+                    organizationId}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public OrganizationSecurityGroup EndGetSecurityGroupGeneralSettings(System.IAsyncResult asyncResult)
+        {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((OrganizationSecurityGroup)(results[0]));
+        }
+
+        /// <remarks/>
+        public void GetSecurityGroupGeneralSettingsAsync(string groupName, string organizationId)
+        {
+            this.GetSecurityGroupGeneralSettingsAsync(groupName, organizationId, null);
+        }
+
+        /// <remarks/>
+        public void GetSecurityGroupGeneralSettingsAsync(string groupName, string organizationId, object userState)
+        {
+            if ((this.GetSecurityGroupGeneralSettingsOperationCompleted == null))
+            {
+                this.GetSecurityGroupGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecurityGroupGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("GetSecurityGroupGeneralSettings", new object[] {
+                    groupName,
+                    organizationId}, this.GetSecurityGroupGeneralSettingsOperationCompleted, userState);
+        }
+
+        private void OnGetSecurityGroupGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.GetSecurityGroupGeneralSettingsCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSecurityGroupGeneralSettingsCompleted(this, new GetSecurityGroupGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void DeleteSecurityGroup(string groupName, string organizationId)
+        {
+            this.Invoke("DeleteSecurityGroup", new object[] {
+                    groupName,
+                    organizationId});
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteSecurityGroup(string groupName, string organizationId, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("DeleteSecurityGroup", new object[] {
+                    groupName,
+                    organizationId}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public void EndDeleteSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            this.EndInvoke(asyncResult);
+        }
+
+        /// <remarks/>
+        public void DeleteSecurityGroupAsync(string groupName, string organizationId)
+        {
+            this.DeleteSecurityGroupAsync(groupName, organizationId, null);
+        }
+
+        /// <remarks/>
+        public void DeleteSecurityGroupAsync(string groupName, string organizationId, object userState)
+        {
+            if ((this.DeleteSecurityGroupOperationCompleted == null))
+            {
+                this.DeleteSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("DeleteSecurityGroup", new object[] {
+                    groupName,
+                    organizationId}, this.DeleteSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnDeleteSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.DeleteSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteSecurityGroupCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetSecurityGroupGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
+        {
+            this.Invoke("SetSecurityGroupGeneralSettings", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy,
+                    memberAccounts,
+                    notes});
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginSetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("SetSecurityGroupGeneralSettings", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy,
+                    memberAccounts,
+                    notes}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public void EndSetSecurityGroupGeneralSettings(System.IAsyncResult asyncResult)
+        {
+            this.EndInvoke(asyncResult);
+        }
+
+        /// <remarks/>
+        public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
+        {
+            this.SetSecurityGroupGeneralSettingsAsync(organizationId, groupName, managedBy, memberAccounts, notes, null);
+        }
+
+        /// <remarks/>
+        public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes, object userState)
+        {
+            if ((this.SetSecurityGroupGeneralSettingsOperationCompleted == null))
+            {
+                this.SetSecurityGroupGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetSecurityGroupGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("SetSecurityGroupGeneralSettings", new object[] {
+                    organizationId,
+                    groupName,
+                    managedBy,
+                    memberAccounts,
+                    notes}, this.SetSecurityGroupGeneralSettingsOperationCompleted, userState);
+        }
+
+        private void OnSetSecurityGroupGeneralSettingsOperationCompleted(object arg)
+        {
+            if ((this.SetSecurityGroupGeneralSettingsCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetSecurityGroupGeneralSettingsCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddUserToSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void AddUserToSecurityGroup(string organizationId, string loginName, string groupName)
+        {
+            this.Invoke("AddUserToSecurityGroup", new object[] {
+                    organizationId,
+                    loginName,
+                    groupName});
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginAddUserToSecurityGroup(string organizationId, string loginName, string groupName, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("AddUserToSecurityGroup", new object[] {
+                    organizationId,
+                    loginName,
+                    groupName}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public void EndAddUserToSecurityGroup(System.IAsyncResult asyncResult)
+        {
+            this.EndInvoke(asyncResult);
+        }
+
+        /// <remarks/>
+        public void AddUserToSecurityGroupAsync(string organizationId, string loginName, string groupName)
+        {
+            this.AddUserToSecurityGroupAsync(organizationId, loginName, groupName, null);
+        }
+
+        /// <remarks/>
+        public void AddUserToSecurityGroupAsync(string organizationId, string loginName, string groupName, object userState)
+        {
+            if ((this.AddUserToSecurityGroupOperationCompleted == null))
+            {
+                this.AddUserToSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddUserToSecurityGroupOperationCompleted);
+            }
+            this.InvokeAsync("AddUserToSecurityGroup", new object[] {
+                    organizationId,
+                    loginName,
+                    groupName}, this.AddUserToSecurityGroupOperationCompleted, userState);
+        }
+
+        private void OnAddUserToSecurityGroupOperationCompleted(object arg)
+        {
+            if ((this.AddUserToSecurityGroupCompleted != null))
+            {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddUserToSecurityGroupCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -1197,6 +1496,78 @@ namespace WebsitePanel.Providers.HostedSolution
         }
     }
 
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void CreateSecurityGroupCompletedEventHandler(object sender, CreateSecurityGroupCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateSecurityGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal CreateSecurityGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public int Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetSecurityGroupGeneralSettingsCompletedEventHandler(object sender, GetSecurityGroupGeneralSettingsCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSecurityGroupGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    {
+
+        private object[] results;
+
+        internal GetSecurityGroupGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+        {
+            this.results = results;
+        }
+
+        /// <remarks/>
+        public OrganizationSecurityGroup Result
+        {
+            get
+            {
+                this.RaiseExceptionIfNecessary();
+                return ((OrganizationSecurityGroup)(this.results[0]));
+            }
+        }
+    }
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void DeleteSecurityGroupCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetSecurityGroupGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void AddUserToSecurityGroupCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetUserGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
index 1e814394..dd7f3504 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
@@ -110,6 +110,36 @@ namespace WebsitePanel.Server
             return Organization.GetUserGeneralSettings(loginName, organizationId);
         }
 
+        [WebMethod, SoapHeader("settings")]
+        public int CreateSecurityGroup(string organizationId, string groupName, string managedBy)
+        {
+            return Organization.CreateSecurityGroup(organizationId, groupName, managedBy);
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId)
+        {
+            return Organization.GetSecurityGroupGeneralSettings(groupName, organizationId);
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public void DeleteSecurityGroup(string groupName, string organizationId)
+        {
+            Organization.DeleteSecurityGroup(groupName, organizationId);
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
+        {
+            Organization.SetSecurityGroupGeneralSettings(organizationId, groupName, managedBy, memberAccounts, notes);
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public void AddUserToSecurityGroup(string organizationId, string loginName, string groupName)
+        {
+            Organization.AddUserToSecurityGroup(organizationId, loginName, groupName);
+        }
+
         [WebMethod, SoapHeader("settings")]
         public void SetUserGeneralSettings(string organizationId, string accountName, string displayName, string password,
             bool hideFromAddressBook, bool disabled, bool locked, string firstName, string initials, string lastName,
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
index fd56bbb9..cdbb540b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -545,6 +545,10 @@
       <Control key="add_lyncuserplan" src="WebsitePanel/Lync/LyncAddLyncUserPlan.ascx" title="LyncAddLyncUserPlan" type="View" />
       <Control key="edit_lync_user" src="WebsitePanel/Lync/LyncEditUser.ascx" title="Edit Lync User" type="View" />
 
+	    <Control key="secur_groups" src="WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx" title="OrganizationSecurityGroups" type="View" />
+      <Control key="create_secur_group" src="WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx" title="OrganizationSecurityGroup" type="View" />
+      <Control key="secur_group_settings" src="WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx" title="OrganizationSecurityGroup" type="View" />
+
     </Controls>
 	</ModuleDefinition>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index e6c16978..da073665 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3301,6 +3301,9 @@
   <data name="Quota.HostedSolution.Domains" xml:space="preserve">
     <value>Domains per Organization</value>
   </data>
+  <data name="Quota.HostedSolution.SecurityGroupManagement" xml:space="preserve">
+    <value>Allow Security Group Management</value>
+  </data>
   <data name="ResourceGroup.Hosted SharePoint" xml:space="preserve">
     <value>Hosted SharePoint</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/OrganizationsHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/OrganizationsHelper.cs
index f6790dde..6537ad67 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/OrganizationsHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/OrganizationsHelper.cs
@@ -83,5 +83,30 @@ namespace WebsitePanel.Portal
         }
 
         #endregion
+
+        #region Security Groups
+
+        ExchangeAccountsPaged accounts;
+
+        public int GetOrganizationSecurityGroupsPagedCount(int itemId, string accountTypes,
+            string filterColumn, string filterValue)
+        {
+            return accounts.RecordsCount;
+        }
+
+        public ExchangeAccount[] GetOrganizationSecurityGroupsPaged(int itemId, string accountTypes,
+            string filterColumn, string filterValue,
+            int maximumRows, int startRowIndex, string sortColumn)
+        {
+            if (!String.IsNullOrEmpty(filterValue))
+                filterValue = filterValue + "%";
+
+            accounts = ES.Services.Organizations.GetOrganizationSecurityGroupsPaged(itemId,
+                filterColumn, filterValue, sortColumn, startRowIndex, maximumRows);
+
+            return accounts.PageItems;
+        }
+
+        #endregion
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationCreateSecurityGroup.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationCreateSecurityGroup.ascx.resx
new file mode 100644
index 00000000..302d4e79
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationCreateSecurityGroup.ascx.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCreate.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Creating group ...');</value>
+  </data>
+  <data name="btnCreate.Text" xml:space="preserve">
+    <value>Create Group</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="locAccount.Text" xml:space="preserve">
+    <value>E-mail Address: *</value>
+  </data>
+  <data name="locDisplayName.Text" xml:space="preserve">
+    <value>Display Name: *</value>
+  </data>
+  <data name="locManagedBy.Text" xml:space="preserve">
+    <value>Managed by: *</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Create New Group</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Security Groups</value>
+  </data>
+  <data name="valManager.ErrorMessage" xml:space="preserve">
+    <value>Please specify a manager</value>
+  </data>
+  <data name="valRequireDisplayName.ErrorMessage" xml:space="preserve">
+    <value>Enter Display Name</value>
+  </data>
+  <data name="valRequireDisplayName.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroupGeneralSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroupGeneralSettings.ascx.resx
new file mode 100644
index 00000000..44c43842
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroupGeneralSettings.ascx.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnSave.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating group settings...');</value>
+  </data>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save Changes</value>
+  </data>
+  <data name="chkHideAddressBook.Text" xml:space="preserve">
+    <value>Hide from Address Book</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="locManager.Text" xml:space="preserve">
+    <value>Managed By: *</value>
+  </data>
+  <data name="locMembers.Text" xml:space="preserve">
+    <value>Members:</value>
+  </data>
+  <data name="locNotes.Text" xml:space="preserve">
+    <value>Notes:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit Group</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Security Groups</value>
+  </data>
+  <data name="valManager.ErrorMessage" xml:space="preserve">
+    <value>Please specify a manager</value>
+  </data>
+  <data name="valRequireDisplayName.ErrorMessage" xml:space="preserve">
+    <value>Enter Display Name</value>
+  </data>
+  <data name="valRequireDisplayName.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
new file mode 100644
index 00000000..62ee62f5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCreateGroup.Text" xml:space="preserve">
+    <value>Create New Group</value>
+  </data>
+  <data name="cmdDelete.OnClientClick" xml:space="preserve">
+    <value>if(!confirm('Are you sure you want to delete this group?')) return false; else ShowProgressDialog('Deleting group...');</value>
+  </data>
+  <data name="cmdDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="cmdDelete.ToolTip" xml:space="preserve">
+    <value>Delete Group</value>
+  </data>
+  <data name="cmdSearch.AlternateText" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="ddlSearchColumnDisplayName.Text" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="gvGroups.Empty" xml:space="preserve">
+    <value>No groups have been created. To create a new group click "Create New Group" button.</value>
+  </data>
+  <data name="gvGroupsDisplayName.Header" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Groups</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Security Groups</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
new file mode 100644
index 00000000..b3b0e1a8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
@@ -0,0 +1,55 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="OrganizationCreateSecurityGroup.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.OrganizationCreateSecurityGroup" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EmailAddress.ascx" TagName="EmailAddress" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<%@ Register src="UserControls/UserSelector.ascx" tagname="UserSelector" tagprefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Header">
+			<wsp:Breadcrumb id="breadcrumb" runat="server" PageName="Text.PageName" />
+		</div>
+		<div class="Left">
+			<wsp:Menu id="menu" runat="server" SelectedItem="dlists" />
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="ExchangeListAdd48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Create Group"></asp:Localize>
+				</div>
+				<div class="FormBody">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+					<table>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locDisplayName" runat="server" meta:resourcekey="locDisplayName" Text="Display Name: *"></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtDisplayName" runat="server" CssClass="HugeTextBox200"></asp:TextBox>
+								<asp:RequiredFieldValidator ID="valRequireDisplayName" runat="server" meta:resourcekey="valRequireDisplayName" ControlToValidate="txtDisplayName"
+									ErrorMessage="Enter Display Name" ValidationGroup="CreateGroup" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
+							</td>
+						</tr>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="Localize1" runat="server" meta:resourcekey="locManagedBy" ></asp:Localize></td>
+							<td>                                
+                                 <wsp:userselector id="manager" IncludeMailboxes="true" runat="server" />											
+								 <asp:CustomValidator runat="server" 
+                                     ValidationGroup="CreateGroup"  meta:resourcekey="valManager" ID="valManager" 
+                                     onservervalidate="valManager_ServerValidate" />
+                            </td>
+						</tr>
+					</table>
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnCreate" runat="server" Text="Create Group" CssClass="Button1" meta:resourcekey="btnCreate" ValidationGroup="CreateGroup" OnClick="btnCreate_Click"></asp:Button>
+					    <asp:ValidationSummary ID="ValidationSummary1" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="CreateGroup" />
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.cs
new file mode 100644
index 00000000..d81a3ecc
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.cs
@@ -0,0 +1,83 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class OrganizationCreateSecurityGroup : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        protected void btnCreate_Click(object sender, EventArgs e)
+        {
+            CreateSecurityGroup();
+        }
+
+        private void CreateSecurityGroup()
+        {
+            if (!Page.IsValid)
+                return;
+            try
+            {
+                int accountId = ES.Services.Organizations.CreateSecurityGroup(PanelRequest.ItemID, txtDisplayName.Text, manager.GetAccount());
+
+                if (accountId < 0)
+                {
+                    messageBox.ShowResultMessage(accountId);
+                    return;
+                }
+
+                Response.Redirect(EditUrl("AccountID", accountId.ToString(), "secur_group_settings",
+                    "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                    "ItemID=" + PanelRequest.ItemID.ToString()));
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ORGANIZATION_CREATE_SECURITY_GROUP", ex);
+            }
+        }
+
+        protected void valManager_ServerValidate(object source, ServerValidateEventArgs args)
+        {
+            args.IsValid = manager.GetAccountId() != 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.designer.cs
new file mode 100644
index 00000000..13281f4f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.designer.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class OrganizationCreateSecurityGroup {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locDisplayName;
+        
+        /// <summary>
+        /// txtDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtDisplayName;
+        
+        /// <summary>
+        /// valRequireDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireDisplayName;
+        
+        /// <summary>
+        /// Localize1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize Localize1;
+        
+        /// <summary>
+        /// manager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.UserSelector manager;
+        
+        /// <summary>
+        /// valManager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CustomValidator valManager;
+        
+        /// <summary>
+        /// btnCreate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCreate;
+        
+        /// <summary>
+        /// ValidationSummary1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
new file mode 100644
index 00000000..f6453c2c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
@@ -0,0 +1,82 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="OrganizationSecurityGroupGeneralSettings.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.OrganizationSecurityGroupGeneralSettings" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/UsersList.ascx" TagName="UsersList" TagPrefix="wsp"%>
+<%@ Register Src="UserControls/UserSelector.ascx" TagName="UserSelector" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/SecurityGroupTabs.ascx" TagName="SecurityGroupTabs" TagPrefix="wsp"%>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Header">
+			<wsp:Breadcrumb id="breadcrumb" runat="server" PageName="Text.PageName" />
+		</div>
+		<div class="Left">
+			<wsp:Menu id="menu" runat="server" SelectedItem="secur_groups" />
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Security Group"></asp:Localize>
+
+					<asp:Literal ID="litDisplayName" runat="server" Text="John Smith" />
+                </div>
+				<div class="FormBody">
+                    <wsp:SecurityGroupTabs id="tabs" runat="server" SelectedTab="secur_group_settings" />
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+					<table>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locDisplayName" runat="server" meta:resourcekey="locDisplayName" Text="Display Name: *"></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtDisplayName" runat="server" CssClass="HugeTextBox200" ValidationGroup="CreateMailbox"></asp:TextBox>
+								<asp:RequiredFieldValidator ID="valRequireDisplayName" runat="server" meta:resourcekey="valRequireDisplayName" ControlToValidate="txtDisplayName"
+									ErrorMessage="Enter Display Name" ValidationGroup="EditList" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
+                                <br />
+						        <br />
+							</td>
+						</tr>
+					    <tr>
+						    <td class="FormLabel150"><asp:Localize ID="locManager" runat="server" meta:resourcekey="locManager" Text="Manager:"></asp:Localize></td>
+						    <td>
+                                <wsp:UserSelector id="manager" runat="server" />
+											
+								<asp:CustomValidator runat="server" 
+                                     ValidationGroup="EditList"  meta:resourcekey="valManager" ID="valManager" 
+                                     onservervalidate="valManager_ServerValidate" />
+                            </td>
+					    </tr>
+					    
+					    <tr><td>&nbsp;</td></tr>
+						<tr>
+							<td colspan="2"><asp:Localize ID="locMembers" runat="server" meta:resourcekey="locMembers" Text="Members:"></asp:Localize></td>
+						</tr>
+						<tr>
+						    <td colspan="2">
+                                <wsp:UsersList id="members" runat="server" />
+                            </td>
+						</tr>
+					    <tr><td>&nbsp;</td></tr>
+						<tr>
+							<td class="FormLabel150" colspan="2"><asp:Localize ID="locNotes" runat="server" meta:resourcekey="locNotes" Text="Notes:"></asp:Localize></td>
+						</tr>
+					    <tr>
+						    <td colspan="2">
+							    <asp:TextBox ID="txtNotes" runat="server" CssClass="TextBox200" Rows="4" TextMode="MultiLine"></asp:TextBox>
+						    </td>
+					    </tr>
+					</table>
+					
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave" ValidationGroup="EditList" OnClick="btnSave_Click"></asp:Button>
+					    <asp:ValidationSummary ID="ValidationSummary1" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="EditList" />
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.cs
new file mode 100644
index 00000000..d8f71bf4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.cs
@@ -0,0 +1,130 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class OrganizationSecurityGroupGeneralSettings : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindSettings();
+            }
+        }
+
+        private void BindSettings()
+        {
+            try
+            {
+                // get settings
+                OrganizationSecurityGroup securityGroup = ES.Services.Organizations.GetSecurityGroupGeneralSettings(
+                    PanelRequest.ItemID, PanelRequest.AccountID);
+
+                litDisplayName.Text = PortalAntiXSS.Encode(securityGroup.DisplayName);
+
+                // bind form
+                txtDisplayName.Text = securityGroup.DisplayName;
+
+                manager.SetAccount(securityGroup.ManagerAccount);
+
+                members.SetAccounts(securityGroup.MembersAccounts);
+
+                txtNotes.Text = securityGroup.Notes;
+
+                if (securityGroup.IsDefault)
+                {
+                    txtDisplayName.ReadOnly = true;
+                    txtNotes.ReadOnly = true;
+                    manager.Enabled = false;
+                    members.Enabled = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ORGANIZATION_GET_SECURITY_GROUP_SETTINGS", ex);
+            }
+        }
+
+        private void SaveSettings()
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                int result = ES.Services.Organizations.SetSecurityGroupGeneralSettings(
+                    PanelRequest.ItemID,
+                    PanelRequest.AccountID,
+                    txtDisplayName.Text,
+                    manager.GetAccount(),
+                    members.GetAccounts(),
+                    txtNotes.Text);
+
+                if (result < 0)
+                {
+                    messageBox.ShowResultMessage(result);
+                    return;
+                }
+
+                litDisplayName.Text = PortalAntiXSS.Encode(txtDisplayName.Text);
+
+                messageBox.ShowSuccessMessage("ORGANIZATION_UPDATE_SECURITY_GROUP_SETTINGS");
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ORGANIZATION_UPDATE_SECURITY_GROUP_SETTINGS", ex);
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveSettings();
+        }
+
+        protected void valManager_ServerValidate(object source, ServerValidateEventArgs args)
+        {
+            args.IsValid = manager.GetAccount() != null;
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.designer.cs
new file mode 100644
index 00000000..15f2c099
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.designer.cs
@@ -0,0 +1,195 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class OrganizationSecurityGroupGeneralSettings {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// litDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal litDisplayName;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SecurityGroupTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locDisplayName;
+        
+        /// <summary>
+        /// txtDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtDisplayName;
+        
+        /// <summary>
+        /// valRequireDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireDisplayName;
+        
+        /// <summary>
+        /// locManager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locManager;
+        
+        /// <summary>
+        /// manager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.UserSelector manager;
+        
+        /// <summary>
+        /// valManager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CustomValidator valManager;
+        
+        /// <summary>
+        /// locMembers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locMembers;
+        
+        /// <summary>
+        /// members control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.UsersList members;
+        
+        /// <summary>
+        /// locNotes control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locNotes;
+        
+        /// <summary>
+        /// txtNotes control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtNotes;
+        
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSave;
+        
+        /// <summary>
+        /// ValidationSummary1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
new file mode 100644
index 00000000..14eabbc4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
@@ -0,0 +1,90 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="OrganizationSecurityGroups.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.OrganizationSecurityGroups" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Header">
+			<wsp:Breadcrumb id="breadcrumb" runat="server" PageName="Text.PageName" />
+		</div>
+		<div class="Left">
+			<wsp:Menu id="menu" runat="server" SelectedItem="secur_groups" />
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Groups"></asp:Localize>
+				</div>
+				
+				<div class="FormBody">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    <div class="FormButtonsBarClean">
+                        <div class="FormButtonsBarCleanLeft">
+                            <asp:Button ID="btnCreateGroup" runat="server" meta:resourcekey="btnCreateGroup"
+                            Text="Create New Group" CssClass="Button1" OnClick="btnCreateGroup_Click" />
+                        </div>
+                        <div class="FormButtonsBarCleanRight">
+                            <asp:Panel ID="SearchPanel" runat="server" DefaultButton="cmdSearch">
+                            <asp:Localize ID="locSearch" runat="server" meta:resourcekey="locSearch" Visible="false"></asp:Localize>
+                                <asp:DropDownList ID="ddlPageSize" runat="server" AutoPostBack="True"    
+                                       onselectedindexchanged="ddlPageSize_SelectedIndexChanged">   
+                                       <asp:ListItem>10</asp:ListItem>   
+                                       <asp:ListItem Selected="True">20</asp:ListItem>   
+                                       <asp:ListItem>50</asp:ListItem>   
+                                       <asp:ListItem>100</asp:ListItem>   
+                                </asp:DropDownList>  
+
+                                <asp:DropDownList ID="ddlSearchColumn" runat="server" CssClass="NormalTextBox">
+                                    <asp:ListItem Value="DisplayName" meta:resourcekey="ddlSearchColumnDisplayName">DisplayName</asp:ListItem>
+                                </asp:DropDownList><asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100"></asp:TextBox><asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton"
+		                            CausesValidation="false"/>
+                            </asp:Panel>
+                        </div>
+                    </div>
+
+				    <asp:GridView ID="gvGroups" runat="server" AutoGenerateColumns="False" EnableViewState="true"
+					    Width="100%" EmptyDataText="gvGroups" CssSelectorClass="NormalGridView"
+					    OnRowCommand="gvSecurityGroups_RowCommand" AllowPaging="True" AllowSorting="True"
+					    DataSourceID="odsSecurityGroupsPaged" PageSize="20">
+					    <Columns>
+						    <asp:TemplateField HeaderText="gvGroupsDisplayName" SortExpression="DisplayName">
+							    <ItemStyle Width="50%"></ItemStyle>
+							    <ItemTemplate>
+								    <asp:hyperlink id="lnk1" runat="server"
+									    NavigateUrl='<%# GetListEditUrl(Eval("AccountId").ToString()) %>'>
+									    <%# Eval("DisplayName") %>
+								    </asp:hyperlink>
+							    </ItemTemplate>
+						    </asp:TemplateField>
+						    <asp:TemplateField>
+							    <ItemTemplate>
+								    <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="ExchangeDelete"
+									    CommandName="DeleteItem" CommandArgument='<%# Eval("AccountId") %>' Visible='<%# IsNotDefault(Eval("AccountType").ToString()) %>'
+									    meta:resourcekey="cmdDelete" OnClientClick="return confirm('Remove this item?');"></asp:ImageButton>
+							    </ItemTemplate>
+						    </asp:TemplateField>
+					    </Columns>
+				    </asp:GridView>
+					<asp:ObjectDataSource ID="odsSecurityGroupsPaged" runat="server" EnablePaging="True"
+							SelectCountMethod="GetOrganizationSecurityGroupsPagedCount"
+							SelectMethod="GetOrganizationSecurityGroupsPaged"
+							SortParameterName="sortColumn"
+							TypeName="WebsitePanel.Portal.OrganizationsHelper"
+							OnSelected="odsSecurityGroupsPaged_Selected">
+						<SelectParameters>
+							<asp:QueryStringParameter Name="itemId" QueryStringField="ItemID" DefaultValue="0" />
+							<asp:Parameter Name="accountTypes" DefaultValue="8" />
+							<asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
+							<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
+						</SelectParameters>
+					</asp:ObjectDataSource>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.cs
new file mode 100644
index 00000000..6719af20
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.cs
@@ -0,0 +1,114 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class OrganizationSecurityGroups : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnCreateGroup_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "create_secur_group",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        public string GetListEditUrl(string accountId)
+        {
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "secur_group_settings",
+                    "AccountID=" + accountId,
+                    "ItemID=" + PanelRequest.ItemID.ToString());
+        }
+
+        public bool IsNotDefault(string accountType)
+        {
+            return (ExchangeAccountType)Enum.Parse(typeof(ExchangeAccountType), accountType) != ExchangeAccountType.DefaultSecurityGroup;
+        }
+
+        protected void odsSecurityGroupsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            if (e.Exception != null)
+            {
+                messageBox.ShowErrorMessage("ORGANIZATION_GET_SECURITY_GROUP", e.Exception);
+                e.ExceptionHandled = true;
+            }
+        }
+
+        protected void gvSecurityGroups_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            if (e.CommandName == "DeleteItem")
+            {
+                // delete security group
+                int accountId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+                try
+                {
+                    int result = ES.Services.Organizations.DeleteSecurityGroup(PanelRequest.ItemID, accountId);
+                    if (result < 0)
+                    {
+                        messageBox.ShowResultMessage(result);
+                        return;
+                    }
+
+                    // rebind grid
+                    gvGroups.DataBind();
+                }
+                catch (Exception ex)
+                {
+                    messageBox.ShowErrorMessage("ORGANIZATION_DELETE_SECURITY_GROUP", ex);
+                }
+            }
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)   
+        {
+            gvGroups.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue);   
+       
+            // rebind grid   
+            gvGroups.DataBind();   
+                
+        }  
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.designer.cs
new file mode 100644
index 00000000..1c8e4bc9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.designer.cs
@@ -0,0 +1,150 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class OrganizationSecurityGroups {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// btnCreateGroup control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCreateGroup;
+        
+        /// <summary>
+        /// SearchPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel SearchPanel;
+        
+        /// <summary>
+        /// locSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locSearch;
+        
+        /// <summary>
+        /// ddlPageSize control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// ddlSearchColumn control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlSearchColumn;
+        
+        /// <summary>
+        /// txtSearchValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtSearchValue;
+        
+        /// <summary>
+        /// cmdSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
+        
+        /// <summary>
+        /// gvGroups control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvGroups;
+        
+        /// <summary>
+        /// odsSecurityGroupsPaged control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource odsSecurityGroupsPaged;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx
index b2479926..2d2936f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx
@@ -10,6 +10,7 @@
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/EmailAddress.ascx" TagName="EmailAddress" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/AccountsList.ascx" TagName="AccountsList" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/UsersList.ascx" TagName="UsersList" TagPrefix="wsp" %>
 
 
 
@@ -42,9 +43,9 @@
                     <uc1:MailboxTabs ID="MailboxTabsId" runat="server" SelectedTab="user_memberof" />
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
                     
-					<wsp:CollapsiblePanel id="secDistributionLists" runat="server" TargetControlID="DistributionLists" meta:resourcekey="secDistributionLists" Text="Distribution Lists"></wsp:CollapsiblePanel>
-                    <asp:Panel ID="DistributionLists" runat="server" Height="0" style="overflow:hidden;">
-						<asp:UpdatePanel ID="GeneralUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+					<wsp:CollapsiblePanel id="secDistributionLists" runat="server" TargetControlID="DistributionListsPanel" meta:resourcekey="secDistributionLists" Text="Distribution Lists"></wsp:CollapsiblePanel>
+                    <asp:Panel ID="DistributionListsPanel" runat="server" Height="0" style="overflow:hidden;">
+						<asp:UpdatePanel ID="DLGeneralUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
 							<ContentTemplate>
 
                                 <wsp:AccountsList id="distrlists" runat="server"
@@ -57,6 +58,20 @@
 						</asp:UpdatePanel>
 					</asp:Panel>
 					
+                    <wsp:CollapsiblePanel id="secSecurityGroups" runat="server" TargetControlID="SecurityGroupsPanel" meta:resourcekey="secSecurityGroups" Text="Security Groups"></wsp:CollapsiblePanel>
+                    <asp:Panel ID="SecurityGroupsPanel" runat="server" Height="0" style="overflow:hidden;">
+						<asp:UpdatePanel ID="SCGeneralUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+							<ContentTemplate>
+
+                                <wsp:AccountsList id="securegroups" runat="server"
+                                            MailboxesEnabled="false" 
+                                            EnableMailboxOnly="false" 
+										    ContactsEnabled="false"
+										    DistributionListsEnabled="false"  />
+
+							</ContentTemplate>
+						</asp:UpdatePanel>
+					</asp:Panel>
 					
 				    <div class="FormFooterClean">
 					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.cs
index e105b864..616eb0b4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.cs
@@ -62,7 +62,6 @@ namespace WebsitePanel.Portal.HostedSolution
                 ExchangeAccount[] dLists = ES.Services.ExchangeServer.GetDistributionListsByMember(PanelRequest.ItemID, PanelRequest.AccountID);
 
                 distrlists.SetAccounts(dLists);
-
             }
             catch (Exception ex)
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.designer.cs
index 72bbeccd..0de5ac65 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx.designer.cs
@@ -103,22 +103,22 @@ namespace WebsitePanel.Portal.HostedSolution {
         protected global::WebsitePanel.Portal.CollapsiblePanel secDistributionLists;
         
         /// <summary>
-        /// DistributionLists control.
+        /// DistributionListsPanel control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel DistributionLists;
+        protected global::System.Web.UI.WebControls.Panel DistributionListsPanel;
         
         /// <summary>
-        /// GeneralUpdatePanel control.
+        /// DLGeneralUpdatePanel control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.UpdatePanel GeneralUpdatePanel;
+        protected global::System.Web.UI.UpdatePanel DLGeneralUpdatePanel;
         
         /// <summary>
         /// distrlists control.
@@ -129,6 +129,42 @@ namespace WebsitePanel.Portal.HostedSolution {
         /// </remarks>
         protected global::WebsitePanel.Portal.ExchangeServer.UserControls.AccountsList distrlists;
         
+        /// <summary>
+        /// secSecurityGroups control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSecurityGroups;
+        
+        /// <summary>
+        /// SecurityGroupsPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel SecurityGroupsPanel;
+        
+        /// <summary>
+        /// SCGeneralUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel SCGeneralUpdatePanel;
+        
+        /// <summary>
+        /// securegroups control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.AccountsList securegroups;
+        
         /// <summary>
         /// btnSave control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
index 88b4cd31..6f7f310c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
@@ -201,4 +201,7 @@
   <data name="Text.LyncFederationDomains" xml:space="preserve">
     <value>Lync Federation Domains</value>
   </data>
+  <data name="Text.SecurityGroups" xml:space="preserve">
+    <value>Security Groups</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/SecurityGroupTabs.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/SecurityGroupTabs.ascx.resx
new file mode 100644
index 00000000..54222974
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/SecurityGroupTabs.ascx.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Tab.Addresses" xml:space="preserve">
+    <value>E-mail Addresses</value>
+  </data>
+  <data name="Tab.Mailflow" xml:space="preserve">
+    <value>Mail Flow Settings</value>
+  </data>
+  <data name="Tab.Settings" xml:space="preserve">
+    <value>General</value>
+  </data>
+	<data name="Tab.Permissions" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="Tab.MemberOf" xml:space="preserve">
+    <value>Member Of</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/UsersList.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/UsersList.ascx.resx
new file mode 100644
index 00000000..54fc0f61
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/UsersList.ascx.resx
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Add...</value>
+  </data>
+  <data name="btnAddSelected.Text" xml:space="preserve">
+    <value>Add Accounts</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="chkIncludeContacts.Text" xml:space="preserve">
+    <value>Contacts</value>
+  </data>
+  <data name="chkIncludeEquipment.Text" xml:space="preserve">
+    <value>Equipment</value>
+  </data>
+  <data name="chkIncludeLists.Text" xml:space="preserve">
+    <value>Distribution Lists</value>
+  </data>
+  <data name="chkIncludeMailboxes.Text" xml:space="preserve">
+    <value>Mailboxes</value>
+  </data>
+  <data name="chkIncludeRooms.Text" xml:space="preserve">
+    <value>Rooms</value>
+  </data>
+  <data name="ddlSearchColumnDisplayName.Text" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="ddlSearchColumnEmail.Text" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="gvAccounts.EmptyDataText" xml:space="preserve">
+    <value>The list of accounts is empty. Click "Add..." button to add accounts.</value>
+  </data>
+  <data name="gvAccountsDisplayName.HeaderText" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="gvAccountsEmail.HeaderText" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="gvPopupAccounts.EmptyDataText" xml:space="preserve">
+    <value>No accounts found.</value>
+  </data>
+  <data name="headerAddAccounts.Text" xml:space="preserve">
+    <value>Organization Users</value>
+  </data>
+  <data name="locIncludeSearch.Text" xml:space="preserve">
+    <value>Include in search:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
index 3792ae03..639a8fed 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
@@ -178,6 +178,9 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                 if (Utils.CheckQouta(Quotas.ORGANIZATION_USERS, cntx))
                     organizationGroup.MenuItems.Add(CreateMenuItem("Users", "users"));
 
+				if (Utils.CheckQouta(Quotas.ORGANIZATION_SECURITYGROUPMANAGEMENT, cntx))
+                    organizationGroup.MenuItems.Add(CreateMenuItem("SecurityGroups", "secur_groups"));
+				
                 if (organizationGroup.MenuItems.Count > 0)
                     groups.Add(organizationGroup);
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx
new file mode 100644
index 00000000..9a1082e8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx
@@ -0,0 +1,24 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SecurityGroupTabs.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.SecurityGroupTabs" %>
+<table width="100%" cellpadding="0" cellspacing="1">
+    <tr>
+        <td class="Tabs">
+            &nbsp;&nbsp;
+            <asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
+                RepeatLayout="Flow" EnableViewState="false">
+                <ItemStyle Wrap="False" />
+                <ItemTemplate>
+                    <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </ItemTemplate>
+                <SelectedItemStyle Wrap="False" />
+                <SelectedItemTemplate>
+                    <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" NavigateUrl='<%# Eval("Url") %>'>
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </SelectedItemTemplate>
+            </asp:DataList>
+        </td>
+    </tr>
+</table>
+<br />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.cs
new file mode 100644
index 00000000..e99be105
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.cs
@@ -0,0 +1,81 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Collections.Generic;
+using WebsitePanel.Portal.Code.UserControls;
+using WebsitePanel.WebPortal;
+using WebsitePanel.EnterpriseServer;
+
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+    public partial class SecurityGroupTabs : WebsitePanelControlBase
+    {
+        private string selectedTab;
+        public string SelectedTab
+        {
+            get { return selectedTab; }
+            set { selectedTab = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindTabs();
+        }
+
+        private void BindTabs()
+        {
+            List<Tab> tabsList = new List<Tab>();
+            tabsList.Add(CreateTab("secur_group_settings", "Tab.Settings"));
+
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
+            // find selected menu item
+            int idx = 0;
+            foreach (Tab tab in tabsList)
+            {
+                if (String.Compare(tab.Id, SelectedTab, true) == 0)
+                    break;
+                idx++;
+            }
+            dlTabs.SelectedIndex = idx;
+
+            dlTabs.DataSource = tabsList;
+            dlTabs.DataBind();
+        }
+
+        private Tab CreateTab(string id, string text)
+        {
+            return new Tab(id, GetLocalizedString(text),
+                HostModule.EditUrl("AccountID", PanelRequest.AccountID.ToString(), id,
+                "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.designer.cs
new file mode 100644
index 00000000..90b558b3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/SecurityGroupTabs.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class SecurityGroupTabs {
+        
+        /// <summary>
+        /// dlTabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DataList dlTabs;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx
index a5c22ab2..5912e0e5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx
@@ -4,8 +4,10 @@
     <ContentTemplate>
 
 <asp:TextBox ID="txtDisplayName" runat="server" CssClass="TextBox200" ReadOnly="true"></asp:TextBox>
+<% if (Enabled) { %>
 <asp:ImageButton ID="ImageButton1" SkinID="ExchangeAddressBook16" runat="server" CausesValidation="false" OnClick="ImageButton1_Click" />
 <asp:LinkButton ID="cmdClear" runat="server" meta:resourcekey="cmdClear" OnClick="cmdClear_Click" CausesValidation="False"></asp:LinkButton>
+<% } %>
 
 <asp:Panel ID="AddAccountsPanel" runat="server" CssClass="Popup" style="display:none">
 	<table class="Popup-Header" cellpadding="0" cellspacing="0">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx.cs
index da7d0b53..c9d5788b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserSelector.ascx.cs
@@ -38,6 +38,14 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
     {
         public const string DirectionString = "DirectionString";
 
+        private bool _enabled = true;
+
+        public bool Enabled
+        {
+            get { return _enabled; }
+            set { _enabled = value; }
+        }
+
         public bool IncludeMailboxes
         {
             get
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
index cdedb8aa..99d73a43 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
@@ -59,7 +59,7 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
 
             PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
-            if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISTRIBUTIONLISTS, cntx))
+            if (Utils.CheckQouta(Quotas.ORGANIZATION_SECURITYGROUPMANAGEMENT, cntx) || Utils.CheckQouta(Quotas.EXCHANGE2007_DISTRIBUTIONLISTS, cntx))
                 tabsList.Add(CreateTab("user_memberof", "Tab.MemberOf"));
 
             // find selected menu item
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx
new file mode 100644
index 00000000..5e68681b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx
@@ -0,0 +1,119 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UsersList.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.UsersList" %>
+<%@ Register Src="../../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+
+<asp:UpdatePanel ID="AccountsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+	<div class="FormButtonsBarClean">
+		<asp:Button ID="btnAdd" runat="server" Text="Add..." CssClass="Button1"  OnClick="btnAdd_Click" meta:resourcekey="btnAdd"  />
+		<asp:Button ID="btnDelete" runat="server" Text="Delete" CssClass="Button1" OnClick="btnDelete_Click" meta:resourcekey="btnDelete"/>
+	</div>
+	<asp:GridView ID="gvAccounts" runat="server" meta:resourcekey="gvAccounts" AutoGenerateColumns="False"
+		Width="600px" CssSelectorClass="NormalGridView"
+		DataKeyNames="AccountName">
+		<Columns>
+			<asp:TemplateField>
+				<HeaderTemplate>
+					<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+				</HeaderTemplate>
+				<ItemTemplate>
+					<asp:CheckBox ID="chkSelect" runat="server" />
+					<asp:Literal ID="litAccountType" runat="server" Visible="false" Text='<%# Eval("AccountType") %>'></asp:Literal>
+				</ItemTemplate>
+				<ItemStyle Width="10px" />
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvAccountsDisplayName" HeaderText="gvAccountsDisplayName">
+				<HeaderStyle Wrap="false" />
+				<ItemStyle Width="50%" Wrap="false"></ItemStyle>
+				<ItemTemplate>
+					<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
+					<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+				</ItemTemplate>
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvAccountsEmail" HeaderText="gvAccountsEmail">
+				<HeaderStyle Wrap="false" />
+				<ItemStyle Width="50%" Wrap="false"></ItemStyle>
+				<ItemTemplate>
+					<asp:Literal ID="litPrimaryEmailAddress" runat="server" Text='<%# Eval("PrimaryEmailAddress") %>'></asp:Literal>
+				</ItemTemplate>
+			</asp:TemplateField>
+		</Columns>
+	</asp:GridView>
+
+
+<asp:Panel ID="AddAccountsPanel" runat="server" CssClass="Popup" style="display:none">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="headerAddAccounts" runat="server" meta:resourcekey="headerAddAccounts"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+<asp:UpdatePanel ID="AddAccountsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+	            
+                <div class="FormButtonsBarClean">
+                    <div class="FormButtonsBarCleanRight">
+                        <asp:Panel ID="SearchPanel" runat="server" DefaultButton="cmdSearch">
+                            <asp:DropDownList ID="ddlSearchColumn" runat="server" CssClass="NormalTextBox">
+                                <asp:ListItem Value="DisplayName" meta:resourcekey="ddlSearchColumnDisplayName">DisplayName</asp:ListItem>
+                                <asp:ListItem Value="PrimaryEmailAddress" meta:resourcekey="ddlSearchColumnEmail">Email</asp:ListItem>
+                            </asp:DropDownList><asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100"></asp:TextBox><asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton"
+	                            CausesValidation="false" OnClick="cmdSearch_Click"/>
+                        </asp:Panel>
+                    </div>
+                </div>
+                <div class="Popup-Scroll">
+					<asp:GridView ID="gvPopupAccounts" runat="server" meta:resourcekey="gvPopupAccounts" AutoGenerateColumns="False"
+						Width="100%" CssSelectorClass="NormalGridView"
+						DataKeyNames="AccountName">
+						<Columns>
+							<asp:TemplateField>
+								<HeaderTemplate>
+									<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+								</HeaderTemplate>
+								<ItemTemplate>
+									<asp:CheckBox ID="chkSelect" runat="server" />
+									<asp:Literal ID="litAccountType" runat="server" Visible="false" Text='<%# Eval("AccountType") %>'></asp:Literal>
+								</ItemTemplate>
+								<ItemStyle Width="10px" />
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsDisplayName">
+								<ItemStyle Width="50%"></ItemStyle>
+								<ItemTemplate>
+									<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
+									<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+								</ItemTemplate>
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsEmail">
+								<ItemStyle Width="50%"></ItemStyle>
+								<ItemTemplate>
+									<asp:Literal ID="litPrimaryEmailAddress" runat="server" Text='<%# Eval("PrimaryEmailAddress") %>'></asp:Literal>
+								</ItemTemplate>
+							</asp:TemplateField>
+						</Columns>
+					</asp:GridView>
+				</div>
+	</ContentTemplate>
+</asp:UpdatePanel>
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+			<asp:Button ID="btnAddSelected" runat="server" CssClass="Button1" meta:resourcekey="btnAddSelected" Text="Add Accounts" OnClick="btnAddSelected_Click" />
+			<asp:Button ID="btnCancelAdd" runat="server" CssClass="Button1" meta:resourcekey="btnCancel" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+
+<asp:Button ID="btnAddAccountsFake" runat="server" style="display:none;" />
+<ajaxToolkit:ModalPopupExtender ID="AddAccountsModal" runat="server"
+	TargetControlID="btnAddAccountsFake" PopupControlID="AddAccountsPanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelAdd" />
+
+	</ContentTemplate>
+</asp:UpdatePanel>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.cs
new file mode 100644
index 00000000..d518459a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.cs
@@ -0,0 +1,355 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Collections.Generic;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+    public partial class UsersList : WebsitePanelControlBase
+	{
+        public const string DirectionString = "DirectionString";
+
+        private bool _enabled = true;
+
+        public bool Enabled
+        {
+            get { return _enabled; }
+            set { _enabled = value; }
+        }
+
+		private enum SelectedState
+		{
+			All,
+			Selected,
+			Unselected
+		}
+
+        public bool IncludeMailboxes
+        {
+            get
+            {
+                object ret = ViewState["IncludeMailboxes"];
+                return (ret != null) ? (bool)ret : false;
+            }
+            set
+            {
+                ViewState["IncludeMailboxes"] = value;
+            }
+        }
+
+        public bool IncludeMailboxesOnly
+        {
+            get
+            {
+                object ret = ViewState["IncludeMailboxesOnly"];
+                return (ret != null) ? (bool)ret : false;
+            }
+            set
+            {
+                ViewState["IncludeMailboxesOnly"] = value;
+            }
+        }
+
+
+        public bool ExcludeOCSUsers
+        {
+            get
+            {
+                object ret = ViewState["ExcludeOCSUsers"];
+                return (ret != null) ? (bool)ret : false;
+            }
+            set
+            {
+                ViewState["ExcludeOCSUsers"] = value;
+            }
+        }
+
+        public bool ExcludeLyncUsers
+        {
+            get
+            {
+                object ret = ViewState["ExcludeLyncUsers"];
+                return (ret != null) ? (bool)ret : false;
+            }
+            set
+            {
+                ViewState["ExcludeLyncUsers"] = value;
+            }
+        }
+
+
+        public bool ExcludeBESUsers
+        {
+            get
+            {
+                object ret = ViewState["ExcludeBESUsers"];
+                return (ret != null) ? (bool)ret : false;
+            }
+            set
+            {
+                ViewState["ExcludeBESUsers"] = value;
+            }
+        }
+
+	    public int ExcludeAccountId
+		{
+			get { return PanelRequest.AccountID; }
+		}
+
+		public void SetAccounts(OrganizationUser[] accounts)
+		{
+			BindAccounts(accounts, false);
+		}
+
+		public string[] GetAccounts()
+		{
+			// get selected accounts
+			List<OrganizationUser> selectedAccounts = GetGridViewAccounts(gvAccounts, SelectedState.All);
+
+			List<string> accountNames = new List<string>();
+			foreach (OrganizationUser account in selectedAccounts)
+				accountNames.Add(account.AccountName);
+
+			return accountNames.ToArray();
+		}
+
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			// register javascript
+			if (!Page.ClientScript.IsClientScriptBlockRegistered("SelectAllCheckboxes"))
+			{
+				string script = @"    function SelectAllCheckboxes(box)
+    {
+		var state = box.checked;
+        var elm = box.parentElement.parentElement.parentElement.parentElement.getElementsByTagName(""INPUT"");
+        for(i = 0; i < elm.length; i++)
+            if(elm[i].type == ""checkbox"" && elm[i].id != box.id && elm[i].checked != state && !elm[i].disabled)
+		        elm[i].checked = state;
+    }";
+				Page.ClientScript.RegisterClientScriptBlock(typeof(AccountsList), "SelectAllCheckboxes",
+					script, true);
+			}
+
+            btnAdd.Visible = Enabled;
+            btnDelete.Visible = Enabled;
+
+            gvAccounts.Columns[0].Visible = Enabled;
+		}
+
+		protected void btnAdd_Click(object sender, EventArgs e)
+		{
+			// bind all accounts
+			BindPopupAccounts();
+
+			// show modal
+			AddAccountsModal.Show();
+		}
+
+		protected void btnDelete_Click(object sender, EventArgs e)
+		{
+			// get selected accounts
+			List<OrganizationUser> selectedAccounts = GetGridViewAccounts(gvAccounts, SelectedState.Unselected);
+
+			// add to the main list
+			BindAccounts(selectedAccounts.ToArray(), false);
+		}
+
+		protected void btnAddSelected_Click(object sender, EventArgs e)
+		{
+			// get selected accounts
+			List<OrganizationUser> selectedAccounts = GetGridViewAccounts(gvPopupAccounts, SelectedState.Selected);
+			
+			// add to the main list
+			BindAccounts(selectedAccounts.ToArray(), true);
+		}
+
+        public string GetAccountImage(int accountTypeId)
+        {
+            string imgName = string.Empty;
+
+            ExchangeAccountType accountType = (ExchangeAccountType)accountTypeId;
+            switch (accountType)
+            {
+                case ExchangeAccountType.Room:
+                    imgName = "room_16.gif";
+                    break;
+                case ExchangeAccountType.Equipment:
+                    imgName = "equipment_16.gif";
+                    break;
+                default:
+                    imgName = "admin_16.png";
+                    break;
+            }
+
+            return GetThemedImage("Exchange/" + imgName);
+        }
+
+		private void BindPopupAccounts()
+		{
+			OrganizationUser[] accounts = ES.Services.Organizations.SearchAccounts(PanelRequest.ItemID,
+				ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", "", IncludeMailboxes);
+
+			if (ExcludeAccountId > 0)
+			{
+				List<OrganizationUser> updatedAccounts = new List<OrganizationUser>();
+				foreach (OrganizationUser account in accounts)
+					if (account.AccountId != ExcludeAccountId)
+						updatedAccounts.Add(account);
+
+				accounts = updatedAccounts.ToArray();
+			}
+
+            if (IncludeMailboxesOnly)
+            {
+
+                List<OrganizationUser> updatedAccounts = new List<OrganizationUser>();
+                foreach (OrganizationUser account in accounts)
+                {
+                    bool addUser = false;
+                    if (account.ExternalEmail != string.Empty) addUser = true;
+                    if ((account.IsBlackBerryUser) & (ExcludeBESUsers)) addUser = false;
+                    if ((account.IsLyncUser) & (ExcludeLyncUsers)) addUser = false;
+
+                    if (addUser) updatedAccounts.Add(account);
+                }
+
+                accounts = updatedAccounts.ToArray();
+            }
+            else
+                if ((ExcludeOCSUsers) | (ExcludeBESUsers) | (ExcludeLyncUsers))
+                {
+
+                    List<OrganizationUser> updatedAccounts = new List<OrganizationUser>();
+                    foreach (OrganizationUser account in accounts)
+                    {
+                        bool addUser = true;
+                        if ((account.IsOCSUser) & (ExcludeOCSUsers)) addUser = false;
+                        if ((account.IsLyncUser) & (ExcludeLyncUsers)) addUser = false;
+                        if ((account.IsBlackBerryUser) & (ExcludeBESUsers)) addUser = false;
+
+                        if (addUser) updatedAccounts.Add(account);
+                    }
+
+                    accounts = updatedAccounts.ToArray();
+                }
+
+
+            Array.Sort(accounts, CompareAccount);
+            if (Direction == SortDirection.Ascending)
+            {
+                Array.Reverse(accounts);
+                Direction = SortDirection.Descending;
+            }
+            else
+                Direction = SortDirection.Ascending;
+
+            gvPopupAccounts.DataSource = accounts;
+            gvPopupAccounts.DataBind();
+		}
+
+		private void BindAccounts(OrganizationUser[] newAccounts, bool preserveExisting)
+		{
+			// get binded addresses
+			List<OrganizationUser> accounts = new List<OrganizationUser>();
+			if(preserveExisting)
+				accounts.AddRange(GetGridViewAccounts(gvAccounts, SelectedState.All));
+
+			// add new accounts
+			if (newAccounts != null)
+			{
+				foreach (OrganizationUser newAccount in newAccounts)
+				{
+					// check if exists
+					bool exists = false;
+					foreach (OrganizationUser account in accounts)
+					{
+						if (String.Compare(newAccount.AccountName, account.AccountName, true) == 0)
+						{
+							exists = true;
+							break;
+						}
+					}
+
+					if (exists)
+						continue;
+
+					accounts.Add(newAccount);
+				}
+			}
+
+			gvAccounts.DataSource = accounts;
+			gvAccounts.DataBind();
+
+            btnDelete.Visible = gvAccounts.Rows.Count > 0;
+		}
+
+		private List<OrganizationUser> GetGridViewAccounts(GridView gv, SelectedState state)
+		{
+			List<OrganizationUser> accounts = new List<OrganizationUser>();
+			for (int i = 0; i < gv.Rows.Count; i++)
+			{
+				GridViewRow row = gv.Rows[i];
+				CheckBox chkSelect = (CheckBox)row.FindControl("chkSelect");
+				if (chkSelect == null)
+					continue;
+
+				OrganizationUser account = new OrganizationUser();
+				account.AccountType = (ExchangeAccountType)Enum.Parse(typeof(ExchangeAccountType), ((Literal)row.FindControl("litAccountType")).Text);
+				account.AccountName = (string)gv.DataKeys[i][0];
+				account.DisplayName = ((Literal)row.FindControl("litDisplayName")).Text;
+				account.PrimaryEmailAddress = ((Literal)row.FindControl("litPrimaryEmailAddress")).Text;
+
+				if(state == SelectedState.All || 
+					(state == SelectedState.Selected && chkSelect.Checked) ||
+					(state == SelectedState.Unselected && !chkSelect.Checked))
+					accounts.Add(account);
+			}
+			return accounts;
+		}
+
+		protected void cmdSearch_Click(object sender, ImageClickEventArgs e)
+		{
+			BindPopupAccounts();
+		}
+
+        private SortDirection Direction
+        {
+            get { return ViewState[DirectionString] == null ? SortDirection.Descending : (SortDirection)ViewState[DirectionString]; }
+            set { ViewState[DirectionString] = value; }
+        }
+
+        private static int CompareAccount(OrganizationUser user1, OrganizationUser user2)
+        {
+            return string.Compare(user1.DisplayName, user2.DisplayName);
+        }
+	}
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.designer.cs
new file mode 100644
index 00000000..d78039bf
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.designer.cs
@@ -0,0 +1,159 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class UsersList {
+        
+        /// <summary>
+        /// AccountsUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel AccountsUpdatePanel;
+        
+        /// <summary>
+        /// btnAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAdd;
+        
+        /// <summary>
+        /// btnDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnDelete;
+        
+        /// <summary>
+        /// gvAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvAccounts;
+        
+        /// <summary>
+        /// AddAccountsPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel AddAccountsPanel;
+        
+        /// <summary>
+        /// headerAddAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize headerAddAccounts;
+        
+        /// <summary>
+        /// AddAccountsUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel AddAccountsUpdatePanel;
+        
+        /// <summary>
+        /// SearchPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel SearchPanel;
+        
+        /// <summary>
+        /// ddlSearchColumn control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlSearchColumn;
+        
+        /// <summary>
+        /// txtSearchValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtSearchValue;
+        
+        /// <summary>
+        /// cmdSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
+        
+        /// <summary>
+        /// gvPopupAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvPopupAccounts;
+        
+        /// <summary>
+        /// btnAddSelected control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddSelected;
+        
+        /// <summary>
+        /// btnCancelAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCancelAdd;
+        
+        /// <summary>
+        /// btnAddAccountsFake control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddAccountsFake;
+        
+        /// <summary>
+        /// AddAccountsModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender AddAccountsModal;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index 689afdc0..0216f51a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -230,6 +230,13 @@
     <Compile Include="ExchangeServer\OrganizationAddDomainName.ascx.designer.cs">
       <DependentUpon>OrganizationAddDomainName.ascx</DependentUpon>
     </Compile>
+    <Compile Include="ExchangeServer\OrganizationCreateSecurityGroup.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>OrganizationCreateSecurityGroup.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\OrganizationCreateSecurityGroup.ascx.designer.cs">
+      <DependentUpon>OrganizationCreateSecurityGroup.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\OrganizationDomainNames.ascx.cs">
       <DependentUpon>OrganizationDomainNames.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -251,6 +258,20 @@
     <Compile Include="ExchangeServer\ExchangeMailboxPlans.ascx.designer.cs">
       <DependentUpon>ExchangeMailboxPlans.ascx</DependentUpon>
     </Compile>
+    <Compile Include="ExchangeServer\OrganizationSecurityGroupGeneralSettings.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>OrganizationSecurityGroupGeneralSettings.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\OrganizationSecurityGroupGeneralSettings.ascx.designer.cs">
+      <DependentUpon>OrganizationSecurityGroupGeneralSettings.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\OrganizationSecurityGroups.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>OrganizationSecurityGroups.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\OrganizationSecurityGroups.ascx.designer.cs">
+      <DependentUpon>OrganizationSecurityGroups.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\OrganizationUserMemberOf.ascx.cs">
       <DependentUpon>OrganizationUserMemberOf.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -269,6 +290,20 @@
     <Compile Include="ExchangeServer\UserControls\MailboxPlanSelector.ascx.designer.cs">
       <DependentUpon>MailboxPlanSelector.ascx</DependentUpon>
     </Compile>
+    <Compile Include="ExchangeServer\UserControls\SecurityGroupTabs.ascx.cs">
+      <DependentUpon>SecurityGroupTabs.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\SecurityGroupTabs.ascx.designer.cs">
+      <DependentUpon>SecurityGroupTabs.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\UsersList.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UsersList.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\UsersList.ascx.designer.cs">
+      <DependentUpon>UsersList.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\UserControls\UserTabs.ascx.cs">
       <DependentUpon>UserTabs.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3934,11 +3969,16 @@
     <Content Include="ExchangeServer\ExchangeDistributionListMemberOf.ascx" />
     <Content Include="ExchangeServer\ExchangeMailboxMemberOf.ascx" />
     <Content Include="ExchangeServer\OrganizationAddDomainName.ascx" />
+    <Content Include="ExchangeServer\OrganizationCreateSecurityGroup.ascx" />
     <Content Include="ExchangeServer\OrganizationDomainNames.ascx" />
     <Content Include="ExchangeServer\ExchangeAddMailboxPlan.ascx" />
     <Content Include="ExchangeServer\ExchangeDisclaimers.ascx" />
     <Content Include="ExchangeServer\ExchangeDisclaimerGeneralSettings.ascx" />
+    <Content Include="ExchangeServer\OrganizationSecurityGroupGeneralSettings.ascx" />
+    <Content Include="ExchangeServer\OrganizationSecurityGroups.ascx" />
     <Content Include="ExchangeServer\OrganizationUserMemberOf.ascx" />
+    <Content Include="ExchangeServer\UserControls\SecurityGroupTabs.ascx" />
+    <Content Include="ExchangeServer\UserControls\UsersList.ascx" />
     <Content Include="Lync\UserControls\LyncUserSettings.ascx" />
     <Content Include="ProviderControls\CRM2011_Settings.ascx" />
     <Content Include="ProviderControls\HeliconZoo_Settings.ascx" />
@@ -5143,6 +5183,12 @@
     <Content Include="App_LocalResources\PhoneNumbers.ascx.resx" />
     <Content Include="App_LocalResources\PhoneNumbersAddPhoneNumber.ascx.resx" />
     <Content Include="App_LocalResources\PhoneNumbersEditPhoneNumber.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\OrganizationCreateSecurityGroup.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\OrganizationSecurityGroupGeneralSettings.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\OrganizationSecurityGroups.ascx.resx" />
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\AccountsListWithPermissions.ascx.resx" />
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\SecurityGroupTabs.ascx.resx" />
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\UsersList.ascx.resx" />
     <EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>