diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index df041e71..cc8efa0f 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -1637,4 +1637,12 @@ 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  
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..edc457e7 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
@@ -114,6 +114,8 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
         private System.Threading.SendOrPostCallback DeleteUserOperationCompleted;
         
         private System.Threading.SendOrPostCallback GetPasswordPolicyOperationCompleted;
+
+        private System.Threading.SendOrPostCallback GetSecurityGroupGeneralSettingsOperationCompleted;
         
         /// <remarks/>
         public esOrganizations() {
@@ -198,6 +200,9 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
         /// <remarks/>
         public event GetPasswordPolicyCompletedEventHandler GetPasswordPolicyCompleted;
 
+        /// <remarks/>
+        public event GetSecurityGroupGeneralSettingsCompletedEventHandler GetSecurityGroupGeneralSettingsCompleted;
+
         /// <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)
@@ -1635,7 +1640,59 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
                 this.GetPasswordPolicyCompleted(this, new GetPasswordPolicyCompletedEventArgs(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/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -2321,4 +2378,35 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
             }
         }
     }
+
+    /// <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]));
+            }
+        }
+    }
+
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 95d5da6f..d4a3f09e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -1640,6 +1640,20 @@ namespace WebsitePanel.EnterpriseServer
             return account;
         }
 
+        /*public static OrganizationUser GetAccount(int itemId, string samAccountName)
+        {
+            OrganizationUser account = ObjectUtils.FillObjectFromDataReader<OrganizationUser>(
+                DataProvider.GetExchangeAccount(itemId, userId));
+
+            if (account == null)
+                return null;
+
+            // decrypt password
+            account.AccountPassword = CryptoUtils.Decrypt(account.AccountPassword);
+
+            return account;
+        }*/
+
         public static OrganizationUser GetAccountByAccountName(int itemId, string AccountName)
         {
             OrganizationUser account = ObjectUtils.FillObjectFromDataReader<OrganizationUser>(
@@ -1717,7 +1731,62 @@ namespace WebsitePanel.EnterpriseServer
 
             return (account);
         }
-       
+
+
+        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("test2.com"/*account.AccountName*/, org.OrganizationId);
+
+                return securityGroup;
+
+                /*foreach (OrganizationUser user in securityGroup.MembersAccounts)
+                {
+                    OrganizationUser userAccount = GetAccount(itemId, user.SamAccountName);
+
+                    user.AccountId = user
+                }*/
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
         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 +2265,100 @@ namespace WebsitePanel.EnterpriseServer
             return ocs;
         }
 
+        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 userId = -1;
+
+            try
+            {
+                /*displayName = displayName.Trim();
+                name = name.Trim();
+                domain = domain.Trim();
+
+                // e-mail
+                string email = name + "@" + domain;
+
+                if (EmailAddressExists(email))
+                    return BusinessErrorCodes.ERROR_EXCHANGE_EMAIL_EXISTS;
+
+                // 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);
+
+                string upn = string.Format("{0}@{1}", name, domain);
+                string sAMAccountName = AppendOrgId(serviceSettings) ? BuildAccountNameWithOrgId(org.OrganizationId, name, org.ServiceId) : BuildAccountName(org.OrganizationId, name, org.ServiceId);
+
+                TaskManager.Write("accountName :" + sAMAccountName);
+                TaskManager.Write("upn :" + upn);
+
+                if (orgProxy.CreateUser(org.OrganizationId, sAMAccountName, displayName, upn, password, enabled) == 0)
+                {
+                    accountName = sAMAccountName;
+                    OrganizationUser retUser = orgProxy.GetUserGeneralSettings(sAMAccountName, org.OrganizationId);
+                    TaskManager.Write("sAMAccountName :" + retUser.DomainUserName);
+
+                    userId = AddOrganizationUser(itemId, sAMAccountName, displayName, email, retUser.DomainUserName, password, subscriberNumber);
+
+                    // register email address
+                    AddAccountEmailAddress(userId, email);
+
+                    if (sendNotification)
+                    {
+                        SendSummaryLetter(org.Id, userId, true, to, "");
+                    }
+                }
+                else
+                {
+                    TaskManager.WriteError("Failed to create user");
+                }*/
+            }
+            catch (Exception ex)
+            {
+                TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+
+            return userId;
+        }
     }
     
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
index ac5a1e38..57477486 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
@@ -242,5 +242,15 @@ namespace WebsitePanel.EnterpriseServer
 
         #endregion
 
+        #region Security Groups
+
+        [WebMethod]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(int itemId, int accountId)
+        {
+            return OrganizationController.GetSecurityGroupGeneralSettings(itemId, accountId);
+        }
+
+        #endregion
+
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
index 99703719..daf73dde 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;
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
index 6da1e71a..3d705576 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
@@ -42,6 +42,8 @@ namespace WebsitePanel.Providers.HostedSolution
 
         OrganizationUser GetUserGeneralSettings(string loginName, string organizationId);
 
+        OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId);
+
         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..5e52f13f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs
@@ -0,0 +1,46 @@
+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;
+        }
+    }
+}
\ 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 5d78b301..338a6d63 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
@@ -101,6 +101,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..2e03725b 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;
 
@@ -498,10 +498,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);
@@ -529,9 +538,8 @@ namespace WebsitePanel.Providers.HostedSolution
             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;
         }
 
@@ -800,6 +808,108 @@ namespace WebsitePanel.Providers.HostedSolution
         }
         #endregion
 
+        #region Security Groups
+
+        public int CreateSecurityGroup(string organizationId, string displayName, string managedBy)
+        {
+            return CreateSecurityGroupInternal(organizationId, displayName, managedBy);
+        }
+
+        internal int CreateSecurityGroupInternal(string organizationId, string displayName, string managedBy)
+        {
+            HostedSolutionLog.LogStart("CreateSecurityGroupInternal");
+            HostedSolutionLog.DebugInfo("organizationId : {0}", organizationId);
+            HostedSolutionLog.DebugInfo("displayName : {0}", displayName);
+
+            if (string.IsNullOrEmpty(organizationId))
+                throw new ArgumentNullException("organizationId");
+
+            bool groupCreated = false;
+            string groupPath = null;
+            try
+            {
+                string path = GetOrganizationPath(organizationId);
+                groupPath = GetUserPath(organizationId, displayName);
+                
+                if (!ActiveDirectoryUtils.AdObjectExists(groupPath))
+                {
+                    ActiveDirectoryUtils.CreateGroup(path, displayName);
+
+                    DirectoryEntry entry = new DirectoryEntry(groupPath);
+                    ActiveDirectoryUtils.SetADObjectProperty(entry, ADAttributes.Manager, managedBy);
+                    entry.CommitChanges();
+                                       
+                    groupCreated = true;
+                    HostedSolutionLog.DebugInfo("Security Group created: {0}", displayName);
+                }
+                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(groupName))
+                throw new ArgumentNullException("groupName");
+
+            string path = GetUserPath(organizationId, groupName);
+
+            DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
+
+            OrganizationSecurityGroup securityGroup = new OrganizationSecurityGroup();
+
+            securityGroup.DisplayName = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.DisplayName);
+            securityGroup.ManagerAccount = GetManager(entry);
+            securityGroup.Notes = ActiveDirectoryUtils.GetADObjectStringProperty(entry, ADAttributes.Notes);
+            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;
+        }
+
+        #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..a89300cf 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
@@ -77,6 +77,8 @@ namespace WebsitePanel.Providers.HostedSolution
 
         private System.Threading.SendOrPostCallback GetUserGeneralSettingsOperationCompleted;
 
+        private System.Threading.SendOrPostCallback GetSecurityGroupGeneralSettingsOperationCompleted;
+
         private System.Threading.SendOrPostCallback SetUserGeneralSettingsOperationCompleted;
 
         private System.Threading.SendOrPostCallback SetUserPasswordOperationCompleted;
@@ -117,6 +119,9 @@ namespace WebsitePanel.Providers.HostedSolution
         /// <remarks/>
         public event GetUserGeneralSettingsCompletedEventHandler GetUserGeneralSettingsCompleted;
 
+        /// <remarks/>
+        public event GetSecurityGroupGeneralSettingsCompletedEventHandler GetSecurityGroupGeneralSettingsCompleted;
+
         /// <remarks/>
         public event SetUserGeneralSettingsCompletedEventHandler SetUserGeneralSettingsCompleted;
 
@@ -458,6 +463,59 @@ namespace WebsitePanel.Providers.HostedSolution
             }
         }
 
+        /// <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/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 +1255,36 @@ namespace WebsitePanel.Providers.HostedSolution
         }
     }
 
+    /// <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 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..8a0c2c05 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
@@ -110,6 +110,12 @@ namespace WebsitePanel.Server
             return Organization.GetUserGeneralSettings(loginName, organizationId);
         }
 
+        [WebMethod, SoapHeader("settings")]
+        public OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId)
+        {
+            return Organization.GetSecurityGroupGeneralSettings(groupName, organizationId);
+        }
+
         [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 63db8671..2e061dfb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -529,6 +529,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 6ce646b8..598a7466 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3302,6 +3302,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/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..1b640863
--- /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 security group ...');</value>
+  </data>
+  <data name="btnCreate.Text" xml:space="preserve">
+    <value>Create Security 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 Security 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..ab196e38
--- /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 security 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 Security Group</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Security Group</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..970456a1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
@@ -0,0 +1,162 @@
+<?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="btnCreateList.Text" xml:space="preserve">
+    <value>Create New Security Group</value>
+  </data>
+  <data name="cmdDelete.OnClientClick" xml:space="preserve">
+    <value>if(!confirm('Are you sure you want to delete this security group?')) return false; else ShowProgressDialog('Deleting security group...');</value>
+  </data>
+  <data name="cmdDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="cmdDelete.ToolTip" xml:space="preserve">
+    <value>Delete Security 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="ddlSearchColumnEmail.Text" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="gvLists.Empty" xml:space="preserve">
+    <value>No security groups have been created. To create a new security group click "Create New Security Group" button.</value>
+  </data>
+  <data name="gvListsDisplayName.Header" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="gvListsEmail.Header" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="locQuota.Text" xml:space="preserve">
+    <value>Total Security Groups Created:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Security 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..2f4d76aa
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
@@ -0,0 +1,56 @@
+<%@ 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 Distribution List"></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="CreateList" 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" runat="server" />											
+								 <asp:CustomValidator runat="server" 
+                                     ValidationGroup="CreateList"  meta:resourcekey="valManager" ID="valManager" 
+                                     onservervalidate="valManager_ServerValidate" />
+                            </td>
+						</tr>
+					</table>
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnCreate" runat="server" Text="Create Distribution List" CssClass="Button1" meta:resourcekey="btnCreate" ValidationGroup="CreateList" OnClick="btnCreate_Click"></asp:Button>
+					    <asp:ValidationSummary ID="ValidationSummary1" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="CreateList" />
+				    </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..1d38154f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx.cs
@@ -0,0 +1,96 @@
+// 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.ExchangeServer.CreateDistributionList(PanelRequest.ItemID,
+                //    txtDisplayName.Text.Trim(),
+                //    email.AccountName,
+                //    email.DomainName,
+                //    manager.GetAccountId());
+
+
+                //if (accountId < 0)
+                //{
+                //    messageBox.ShowResultMessage(accountId);
+                //    return;
+                //}
+
+                //Response.Redirect(EditUrl("AccountID", accountId.ToString(), "dlist_settings",
+                //    "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                //    "ItemID=" + PanelRequest.ItemID.ToString()));
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_CREATE_DISTRIBUTION_LIST", 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..884eeded
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
@@ -0,0 +1,83 @@
+<%@ 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/AccountsList.ascx" TagName="AccountsList" 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="dlists" />
+		</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 Distribution List"></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..7f3e9074
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx.cs
@@ -0,0 +1,125 @@
+// 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;
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_GET_DLIST_SETTINGS", ex);
+            }
+        }
+
+        private void SaveSettings()
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                int result = ES.Services.ExchangeServer.SetDistributionListGeneralSettings(
+                    PanelRequest.ItemID, PanelRequest.AccountID,
+                    txtDisplayName.Text,
+                    false,
+
+                    manager.GetAccount(),
+
+                    members.GetAccounts(),
+
+                    txtNotes.Text);
+
+                if (result < 0)
+                {
+                    messageBox.ShowResultMessage(result);
+                    return;
+                }
+
+                litDisplayName.Text = PortalAntiXSS.Encode(txtDisplayName.Text);
+
+                messageBox.ShowSuccessMessage("EXCHANGE_UPDATE_DLIST_SETTINGS");
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_UPDATE_DLIST_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..95b44dcd
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
@@ -0,0 +1,99 @@
+<%@ 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/QuotaViewer.ascx" TagName="QuotaViewer" 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="dlists" />
+		</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="Lists"></asp:Localize>
+				</div>
+				
+				<div class="FormBody">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    <div class="FormButtonsBarClean">
+                        <div class="FormButtonsBarCleanLeft">
+                            <asp:Button ID="btnCreateList" runat="server" meta:resourcekey="btnCreateList"
+                            Text="Create New Distribution List" CssClass="Button1" OnClick="btnCreateList_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: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"/>
+                            </asp:Panel>
+                        </div>
+                    </div>
+
+				    <asp:GridView ID="gvLists" runat="server" AutoGenerateColumns="False" EnableViewState="true"
+					    Width="100%" EmptyDataText="gvLists" CssSelectorClass="NormalGridView"
+					    OnRowCommand="gvLists_RowCommand" AllowPaging="True" AllowSorting="True"
+					    DataSourceID="odsAccountsPaged" PageSize="20">
+					    <Columns>
+						    <asp:TemplateField HeaderText="gvListsDisplayName" 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:BoundField HeaderText="gvListsEmail" DataField="PrimaryEmailAddress" SortExpression="PrimaryEmailAddress" ItemStyle-Width="50%" />
+						    <asp:TemplateField>
+							    <ItemTemplate>
+								    <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="ExchangeDelete"
+									    CommandName="DeleteItem" CommandArgument='<%# Eval("AccountId") %>'
+									    meta:resourcekey="cmdDelete" OnClientClick="return confirm('Remove this item?');"></asp:ImageButton>
+							    </ItemTemplate>
+						    </asp:TemplateField>
+					    </Columns>
+				    </asp:GridView>
+					<asp:ObjectDataSource ID="odsAccountsPaged" runat="server" EnablePaging="True"
+							SelectCountMethod="GetExchangeAccountsPagedCount"
+							SelectMethod="GetExchangeAccountsPaged"
+							SortParameterName="sortColumn"
+							TypeName="WebsitePanel.Portal.ExchangeHelper"
+							OnSelected="odsAccountsPaged_Selected">
+						<SelectParameters>
+							<asp:QueryStringParameter Name="itemId" QueryStringField="ItemID" DefaultValue="0" />
+							<asp:Parameter Name="accountTypes" DefaultValue="3" />
+							<asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
+							<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
+						</SelectParameters>
+					</asp:ObjectDataSource>
+				    <br />
+				    <asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota" Text="Total Distribution Lists Created:"></asp:Localize>
+				    &nbsp;&nbsp;&nbsp;
+				    <wsp:QuotaViewer ID="listsQuota" runat="server" QuotaTypeId="2" />
+				    
+				    
+				</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..d7fadd39
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.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 OrganizationSecurityGroups : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindStats();
+            }
+
+
+        }
+
+        private void BindStats()
+        {
+            // quota values
+            OrganizationStatistics stats = ES.Services.ExchangeServer.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
+            OrganizationStatistics tenantStats = ES.Services.ExchangeServer.GetOrganizationStatistics(PanelRequest.ItemID);
+            listsQuota.QuotaUsedValue = stats.CreatedDistributionLists;
+            listsQuota.QuotaValue = stats.AllocatedDistributionLists;
+            if (stats.AllocatedDistributionLists != -1) listsQuota.QuotaAvailable = tenantStats.AllocatedDistributionLists - tenantStats.CreatedDistributionLists;
+        }
+
+        protected void btnCreateList_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());
+        }
+
+        protected void odsAccountsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            if (e.Exception != null)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_GET_LISTS", e.Exception);
+                e.ExceptionHandled = true;
+            }
+        }
+
+        protected void gvLists_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            if (e.CommandName == "DeleteItem")
+            {
+                // delete distribution list
+                int accountId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+                try
+                {
+                    int result = ES.Services.ExchangeServer.DeleteDistributionList(PanelRequest.ItemID, accountId);
+                    if (result < 0)
+                    {
+                        messageBox.ShowResultMessage(result);
+                        return;
+                    }
+
+                    // rebind grid
+                    gvLists.DataBind();
+
+                    BindStats();
+                }
+                catch (Exception ex)
+                {
+                    messageBox.ShowErrorMessage("EXCHANGE_DELETE_DISTRIBUTION_LIST", ex);
+                }
+            }
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)   
+        {   
+            gvLists.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue);   
+       
+            // rebind grid   
+            gvLists.DataBind();   
+       
+            // bind stats   
+            BindStats();   
+       
+        }  
+
+    }
+}
\ 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..33a03516
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.designer.cs
@@ -0,0 +1,168 @@
+//------------------------------------------------------------------------------
+// <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>
+        /// btnCreateList 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 btnCreateList;
+        
+        /// <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>
+        /// gvLists 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 gvLists;
+        
+        /// <summary>
+        /// odsAccountsPaged 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 odsAccountsPaged;
+        
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// listsQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer listsQuota;
+    }
+}
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/UsersList.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx
new file mode 100644
index 00000000..3ba117e9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx
@@ -0,0 +1,120 @@
+<%@ 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..081f0341
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UsersList.ascx.cs
@@ -0,0 +1,342 @@
+// 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 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);
+			}
+		}
+
+		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.SamAccountName, account.SamAccountName, 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 0596b4b6..7e36f64f 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,19 @@
     <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>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\UsersList.ascx.designer.cs">
+      <DependentUpon>UsersList.ascx.cs</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\UserControls\UserTabs.ascx.cs">
       <DependentUpon>UserTabs.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3885,11 +3919,15 @@
     <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="Lync\UserControls\LyncUserSettings.ascx" />
     <Content Include="ProviderControls\CRM2011_Settings.ascx" />
     <Content Include="ProviderControls\HeliconZoo_Settings.ascx" />
@@ -5072,6 +5110,12 @@
     <Content Include="ExchangeServer\App_LocalResources\ExchangeDistributionListMemberOf.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\ExchangeMailboxMemberOf.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\OrganizationUserMemberOf.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>