diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index c1669839..0f289fed 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -9129,3 +9129,104 @@ BEGIN
 	INSERT INTO [dbo].[Quotas] (QuotaID, GroupID, QuotaOrder, QuotaName, QuotaDescription, QuotaTypeID, ServiceQuota)
 		VALUES (552, @group_id, 3, 'HostedSharePointServer.UseSharedSSL', 'Use shared SSL Root', 1, 0)
 END
+
+
+-- RDS GPO
+
+IF NOT EXISTS(SELECT * FROM SYS.TABLES WHERE name = 'RDSServerSettings')
+CREATE TABLE [dbo].[RDSServerSettings](
+	[RdsServerId] [int] NOT NULL,
+	[SettingsName] [nvarchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
+	[PropertyName] [nvarchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
+	[PropertyValue] [ntext] COLLATE Latin1_General_CI_AS NULL,
+	[ApplyUsers] [BIT] NOT NULL,
+	[ApplyAdministrators] [BIT] NOT NULL
+ CONSTRAINT [PK_RDSServerSettings] PRIMARY KEY CLUSTERED 
+(
+	[RdsServerId] ASC,
+	[SettingsName] ASC,
+	[PropertyName] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+)
+
+GO
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetRDSServerSettings')
+DROP PROCEDURE GetRDSServerSettings
+GO
+CREATE PROCEDURE GetRDSServerSettings
+(
+	@ServerId int,
+	@SettingsName nvarchar(50)
+)
+AS
+	SELECT RDSServerId, PropertyName, PropertyValue, ApplyUsers, ApplyAdministrators
+	FROM RDSServerSettings
+	WHERE RDSServerId = @ServerId AND SettingsName = @SettingsName			
+GO
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'UpdateRDSServerSettings')
+DROP PROCEDURE UpdateRDSServerSettings
+GO
+CREATE PROCEDURE UpdateRDSServerSettings
+(
+	@ServerId int,
+	@SettingsName nvarchar(50),
+	@Xml ntext
+)
+AS
+
+BEGIN TRAN
+DECLARE @idoc int
+EXEC sp_xml_preparedocument @idoc OUTPUT, @xml
+
+DELETE FROM RDSServerSettings
+WHERE RDSServerId = @ServerId AND SettingsName = @SettingsName
+
+INSERT INTO RDSServerSettings
+(
+	RDSServerId,
+	SettingsName,
+	ApplyUsers,
+	ApplyAdministrators,
+	PropertyName,
+	PropertyValue	
+)
+SELECT
+	@ServerId,
+	@SettingsName,
+	ApplyUsers,
+	ApplyAdministrators,
+	PropertyName,
+	PropertyValue
+FROM OPENXML(@idoc, '/properties/property',1) WITH 
+(
+	PropertyName nvarchar(50) '@name',
+	PropertyValue ntext '@value',
+	ApplyUsers BIT '@applyUsers',
+	ApplyAdministrators BIT '@applyAdministrators'
+) as PV
+
+exec sp_xml_removedocument @idoc
+
+COMMIT TRAN
+
+RETURN 
+
+GO
+
+
+IF EXISTS (SELECT * FROM ResourceGroups WHERE GroupName = 'SharePoint')
+BEGIN
+	DECLARE @group_id INT
+	SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'SharePoint'
+	DELETE FROM Providers WHERE GroupID = @group_id
+	DELETE FROM Quotas WHERE GroupID = @group_id
+	DELETE FROM VirtualGroups WHERE GroupID = @group_id
+	DELETE FROM ServiceItemTypes WHERE GroupID = @group_id	
+	DELETE FROM ResourceGroups WHERE GroupID = @group_id
+END
+
+GO
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSetting.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSetting.cs
new file mode 100644
index 00000000..d51b9155
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSetting.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.EnterpriseServer.Base.RDS
+{
+    public class RdsServerSetting
+    {
+        public string PropertyName { get; set; }
+        public string PropertyValue { get; set; }
+        public bool ApplyUsers { get; set; }
+        public bool ApplyAdministrators { get; set; }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSettings.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSettings.cs
new file mode 100644
index 00000000..56862454
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/RDS/RdsServerSettings.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace WebsitePanel.EnterpriseServer.Base.RDS
+{
+    public class RdsServerSettings
+    {
+        private List<RdsServerSetting> settings = null;
+
+        public const string LOCK_SCREEN_TIMEOUT = "LockScreenTimeout";
+        public const string REMOVE_RUN_COMMAND = "RemoveRunCommand";
+        public const string REMOVE_POWERSHELL_COMMAND = "RemovePowershellCommand";
+        public const string HIDE_C_DRIVE = "HideCDrive";
+        public const string REMOVE_SHUTDOWN_RESTART = "RemoveShutdownRestart";
+        public const string DISABLE_TASK_MANAGER = "DisableTaskManager";
+        public const string CHANGE_DESKTOP_DISABLED = "ChangingDesktopDisabled";
+        public const string SCREEN_SAVER_DISABLED = "ScreenSaverDisabled";
+        public const string DRIVE_SPACE_THRESHOLD = "DriveSpaceThreshold";
+
+        public string SettingsName { get; set; }
+        public int ServerId { get; set; }
+
+        public List<RdsServerSetting> Settings
+        {
+            get
+            {
+                if (settings == null)
+                {
+                    settings = new List<RdsServerSetting>();
+                }
+                return settings;
+            }
+            set
+            {
+                settings = value;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserSettings.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserSettings.cs
index bd033937..251d5dbf 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserSettings.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Users/UserSettings.cs
@@ -64,6 +64,7 @@ namespace WebsitePanel.EnterpriseServer
         public const string DEFAULT_MAILBOXPLANS = "DefaultMailboxPlans";
         public const string DEFAULT_LYNCUSERPLANS = "DefaultLyncUserPlans";
         public const string RDS_SETUP_LETTER = "RDSSetupLetter";
+        public const string RDS_POLICY = "RdsPolicy";
 
         public int UserId;
         public string SettingsName;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
index 63f2d7cd..23f8766e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
@@ -134,6 +134,8 @@
     <Compile Include="Packages\PackageSettings.cs" />
     <Compile Include="Packages\PackageStatus.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RDS\RdsServerSetting.cs" />
+    <Compile Include="RDS\RdsServerSettings.cs" />
     <Compile Include="Reports\OverusageReport.custom.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
index 8a8ac9e4..4d1737fe 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
@@ -20,6 +20,7 @@ namespace WebsitePanel.EnterpriseServer {
     using System.Diagnostics;
     using WebsitePanel.Providers.HostedSolution;
     using WebsitePanel.Providers.RemoteDesktopServices;
+    using WebsitePanel.EnterpriseServer.Base.RDS;
     using WebsitePanel.Providers.Common;
     
     
@@ -132,6 +133,10 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback SendRdsSetupLetterOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetRdsServerSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateRdsServerSettingsOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -290,6 +295,12 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event SendRdsSetupLetterCompletedEventHandler SendRdsSetupLetterCompleted;
         
+        /// <remarks/>
+        public event GetRdsServerSettingsCompletedEventHandler GetRdsServerSettingsCompleted;
+        
+        /// <remarks/>
+        public event UpdateRdsServerSettingsCompletedEventHandler UpdateRdsServerSettingsCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCollection", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public RdsCollection GetRdsCollection(int collectionId) {
@@ -2569,6 +2580,97 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsServerSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public RdsServerSettings GetRdsServerSettings(int serverId, string settingsName) {
+            object[] results = this.Invoke("GetRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName});
+            return ((RdsServerSettings)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetRdsServerSettings(int serverId, string settingsName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public RdsServerSettings EndGetRdsServerSettings(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((RdsServerSettings)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetRdsServerSettingsAsync(int serverId, string settingsName) {
+            this.GetRdsServerSettingsAsync(serverId, settingsName, null);
+        }
+        
+        /// <remarks/>
+        public void GetRdsServerSettingsAsync(int serverId, string settingsName, object userState) {
+            if ((this.GetRdsServerSettingsOperationCompleted == null)) {
+                this.GetRdsServerSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsServerSettingsOperationCompleted);
+            }
+            this.InvokeAsync("GetRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName}, this.GetRdsServerSettingsOperationCompleted, userState);
+        }
+        
+        private void OnGetRdsServerSettingsOperationCompleted(object arg) {
+            if ((this.GetRdsServerSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetRdsServerSettingsCompleted(this, new GetRdsServerSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateRdsServerSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int UpdateRdsServerSettings(int serverId, string settingsName, RdsServerSettings settings) {
+            object[] results = this.Invoke("UpdateRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName,
+                        settings});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateRdsServerSettings(int serverId, string settingsName, RdsServerSettings settings, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("UpdateRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName,
+                        settings}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndUpdateRdsServerSettings(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void UpdateRdsServerSettingsAsync(int serverId, string settingsName, RdsServerSettings settings) {
+            this.UpdateRdsServerSettingsAsync(serverId, settingsName, settings, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateRdsServerSettingsAsync(int serverId, string settingsName, RdsServerSettings settings, object userState) {
+            if ((this.UpdateRdsServerSettingsOperationCompleted == null)) {
+                this.UpdateRdsServerSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateRdsServerSettingsOperationCompleted);
+            }
+            this.InvokeAsync("UpdateRdsServerSettings", new object[] {
+                        serverId,
+                        settingsName,
+                        settings}, this.UpdateRdsServerSettingsOperationCompleted, userState);
+        }
+        
+        private void OnUpdateRdsServerSettingsOperationCompleted(object arg) {
+            if ((this.UpdateRdsServerSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateRdsServerSettingsCompleted(this, new UpdateRdsServerSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -3900,4 +4002,56 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetRdsServerSettingsCompletedEventHandler(object sender, GetRdsServerSettingsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetRdsServerSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetRdsServerSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public RdsServerSettings Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((RdsServerSettings)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void UpdateRdsServerSettingsCompletedEventHandler(object sender, UpdateRdsServerSettingsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpdateRdsServerSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal UpdateRdsServerSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public int Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index d83c4684..6e183d4d 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -4676,6 +4676,23 @@ namespace WebsitePanel.EnterpriseServer
 
         #region RDS
 
+        public static IDataReader GetRdsServerSettings(int serverId, string settingsName)
+        {
+            return SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
+                ObjectQualifier + "GetRDSServerSettings",                
+                new SqlParameter("@ServerId", serverId),
+                new SqlParameter("@SettingsName", settingsName));
+        }
+
+        public static void UpdateRdsServerSettings(int serverId, string settingsName, string xml)
+        {
+            SqlHelper.ExecuteNonQuery(ConnectionString, CommandType.StoredProcedure,
+                ObjectQualifier + "UpdateRDSServerSettings",
+                new SqlParameter("@ServerId", serverId),                
+                new SqlParameter("@SettingsName", settingsName),
+                new SqlParameter("@Xml", xml));
+        }
+
         public static int AddRdsCertificate(int serviceId, string content, byte[] hash, string fileName, DateTime? validFrom, DateTime? expiryDate)
         {
             SqlParameter rdsCertificateId = new SqlParameter("@RDSCertificateID", SqlDbType.Int);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index 3f1f8a2d..080d0c96 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -45,6 +45,7 @@ using WebsitePanel.Providers.RemoteDesktopServices;
 using WebsitePanel.Providers.Web;
 using System.Net.Mail;
 using System.Collections;
+using WebsitePanel.EnterpriseServer.Base.RDS;
 
 namespace WebsitePanel.EnterpriseServer
 {
@@ -320,6 +321,77 @@ namespace WebsitePanel.EnterpriseServer
             return SendRdsSetupLetterInternal(itemId, accountId, to, cc);
         }
 
+        public static RdsServerSettings GetRdsServerSettings(int serverId, string settingsName)
+        {
+            return GetRdsServerSettingsInternal(serverId, settingsName);
+        }              
+
+        public static int UpdateRdsServerSettings(int serverId, string settingsName, RdsServerSettings settings)
+        {
+            return UpdateRdsServerSettingsInternal(serverId, settingsName, settings);
+        }
+
+        private static RdsServerSettings GetRdsServerSettingsInternal(int serverId, string settingsName)
+        {
+            IDataReader reader = DataProvider.GetRdsServerSettings(serverId, settingsName);
+
+            var settings = new RdsServerSettings();
+            settings.ServerId = serverId;
+            settings.SettingsName = settingsName;
+
+            while (reader.Read())
+            {
+                settings.Settings.Add(new RdsServerSetting
+                {
+                    PropertyName = (string)reader["PropertyName"],
+                    PropertyValue = (string)reader["PropertyValue"],
+                    ApplyAdministrators = Convert.ToBoolean("ApplyAdministrators"),
+                    ApplyUsers = Convert.ToBoolean("ApplyUsers")
+                });                
+            }
+
+            reader.Close();
+
+            return settings;
+        }  
+
+        private static int UpdateRdsServerSettingsInternal(int serverId, string settingsName, RdsServerSettings settings)
+        {
+            TaskManager.StartTask("REMOTE_DESKTOP_SERVICES", "UPDATE_SETTINGS");
+
+            try
+            {                
+                XmlDocument doc = new XmlDocument();
+                XmlElement nodeProps = doc.CreateElement("properties");
+
+                if (settings != null)
+                {
+                    foreach (var setting in settings.Settings)
+                    {
+                        XmlElement nodeProp = doc.CreateElement("property");
+                        nodeProp.SetAttribute("name", setting.PropertyName);
+                        nodeProp.SetAttribute("value", setting.PropertyValue);
+                        nodeProp.SetAttribute("applyUsers", setting.ApplyUsers ? "1" : "0");
+                        nodeProp.SetAttribute("applyAdministrators", setting.ApplyAdministrators ? "1" : "0");
+                        nodeProps.AppendChild(nodeProp);
+                    }
+                }
+
+                string xml = nodeProps.OuterXml;                
+                DataProvider.UpdateRdsServerSettings(serverId, settingsName, xml);
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
         private static string GetRdsSetupLetterInternal(int itemId, int? accountId)
         {
             Organization org = OrganizationController.GetOrganization(itemId);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
index 6471f151..7b977052 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
@@ -39,6 +39,7 @@ using Microsoft.Web.Services3;
 using WebsitePanel.Providers.Common;
 using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.Providers.RemoteDesktopServices;
+using WebsitePanel.EnterpriseServer.Base.RDS;
 
 namespace WebsitePanel.EnterpriseServer
 {
@@ -367,5 +368,17 @@ namespace WebsitePanel.EnterpriseServer
         {
             return RemoteDesktopServicesController.SendRdsSetupLetter(itemId, accountId, to, cc);
         }
+
+        [WebMethod]
+        public RdsServerSettings GetRdsServerSettings(int serverId, string settingsName)
+        {
+            return RemoteDesktopServicesController.GetRdsServerSettings(serverId, settingsName);
+        }
+
+        [WebMethod]
+        public int UpdateRdsServerSettings(int serverId, string settingsName, RdsServerSettings settings)
+        {
+            return RemoteDesktopServicesController.UpdateRdsServerSettings(serverId, settingsName, settings);
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.sln b/WebsitePanel/Sources/WebsitePanel.Server.sln
index 2b573470..c5af78c6 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.sln
+++ b/WebsitePanel/Sources/WebsitePanel.Server.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching Application Block", "Caching Application Block", "{C8E6F2E4-A5B8-486A-A56E-92D864524682}"
 	ProjectSection(SolutionItems) = preProject
@@ -51,8 +51,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebsitePanel.Providers.Mail
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebsitePanel.Providers.Mail.Merak", "WebsitePanel.Providers.Mail.Merak\WebsitePanel.Providers.Mail.Merak.vbproj", "{2FA82B71-B32A-47DE-A17B-40DE08D0256D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.SharePoint.Sps20", "WebsitePanel.Providers.SharePoint.Sps20\WebsitePanel.Providers.SharePoint.Sps20.csproj", "{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.Mail.AbilityMailServer", "WebsitePanel.Providers.Mail.AbilityMailServer\WebsitePanel.Providers.Mail.AbilityMailServer.csproj", "{54EE4293-6CCB-4859-8B76-90205F7B35A1}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebsitePanel.Providers.Mail.ArgoMail", "WebsitePanel.Providers.Mail.ArgoMail\WebsitePanel.Providers.Mail.ArgoMail.vbproj", "{FCD88E94-349D-4BB2-A726-6E47A4F01DC2}"
@@ -63,8 +61,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebsitePanel.Providers.Mail
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebsitePanel.Providers.Mail.hMailServer43", "WebsitePanel.Providers.Mail.hMailServer43\WebsitePanel.Providers.Mail.hMailServer43.vbproj", "{622E452B-E1EF-4252-8039-A28C2EA25DC1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.SharePoint.Sps30", "WebsitePanel.Providers.SharePoint.Sps30\WebsitePanel.Providers.SharePoint.Sps30.csproj", "{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.DNS.Bind", "WebsitePanel.Providers.DNS.Bind\WebsitePanel.Providers.DNS.Bind.csproj", "{3ACCBEAE-5E1E-43E5-971C-223539832DD8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.FTP.ServU", "WebsitePanel.Providers.FTP.ServU\WebsitePanel.Providers.FTP.ServU.csproj", "{41FEC24A-67A2-4BF4-8889-1D5CD0A2B43D}"
@@ -346,16 +342,6 @@ Global
 		{2FA82B71-B32A-47DE-A17B-40DE08D0256D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FA82B71-B32A-47DE-A17B-40DE08D0256D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2FA82B71-B32A-47DE-A17B-40DE08D0256D}.Release|x86.ActiveCfg = Release|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7980CF32-62ED-4BA1-9CAE-8EE7BD164719}.Release|x86.ActiveCfg = Release|Any CPU
 		{54EE4293-6CCB-4859-8B76-90205F7B35A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54EE4293-6CCB-4859-8B76-90205F7B35A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54EE4293-6CCB-4859-8B76-90205F7B35A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -406,16 +392,6 @@ Global
 		{622E452B-E1EF-4252-8039-A28C2EA25DC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{622E452B-E1EF-4252-8039-A28C2EA25DC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{622E452B-E1EF-4252-8039-A28C2EA25DC1}.Release|x86.ActiveCfg = Release|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{67B126AA-56E5-42F7-AC4F-AEE2A7D786F2}.Release|x86.ActiveCfg = Release|Any CPU
 		{3ACCBEAE-5E1E-43E5-971C-223539832DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3ACCBEAE-5E1E-43E5-971C-223539832DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3ACCBEAE-5E1E-43E5-971C-223539832DD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
index 6bb79ad7..bd1b090e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
@@ -26,7 +26,7 @@
 .TopMenu ul.AspNet-Menu li.AspNet-Menu-Hover a, .TopMenu ul.AspNet-Menu li.AspNet-Menu-Hover span {}
 .TopMenu ul.AspNet-Menu li ul li {margin: 0px; width: 100%;}
 /*.TopMenu .AspNet-Menu-Horizontal ul.AspNet-Menu ul:before {width:0; height:0; position:absolute; content:" "; top:-8px; left:50%; margin-left:-8px; border-style:solid; border-width:0 8px 8px 8px; border-color:transparent transparent #fff transparent;}*/
-.TopMenu .AspNet-Menu-Horizontal ul.AspNet-Menu ul {position: absolute; top: 100%; left: 0; z-index: 1000; float: left; min-width: 160px; padding: 5px 10px 5px 0; margin: -10px 0 0 0; list-style: none; font-size: 14px; background-color: #FFF; border: 1px solid #CCC; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 0; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box;}
+.TopMenu .AspNet-Menu-Horizontal ul.AspNet-Menu ul {position: absolute; top: 100%; left: 0; z-index: 1000; float: left; min-width: 180px; padding: 5px 10px 5px 0; margin: -10px 0 0 0; list-style: none; font-size: 14px; background-color: #FFF; border: 1px solid #CCC; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 0; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box;}
 .LeftMenu {font-size: 8pt;}
 .LeftMenu ul {background-color: #D1E9FF;}
 .LeftMenu ul.AspNet-Menu {width: 190px;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
index 7d61c423..e7626d44 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
@@ -202,7 +202,7 @@
     <value>Setup</value>
   </data>
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
-    <value>SharePoint Foundation Server</value>
+    <value>SharePoint Foundation</value>
   </data>
   <data name="Text.SharePointServerGroup" xml:space="preserve">
     <value>SharePoint Server</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx
new file mode 100644
index 00000000..91b50033
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.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="cbAdministrators.Text" xml:space="preserve">
+    <value>Administrators</value>
+  </data>
+  <data name="cbUsers.Text" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="secDriveSpace.Text" xml:space="preserve">
+    <value>Drive Space Threshold</value>
+  </data>
+  <data name="secHideCDrive.Text" xml:space="preserve">
+    <value>Hide C: Drive</value>
+  </data>
+  <data name="secPowershellCommand.Text" xml:space="preserve">
+    <value>Remove "Powershell" Command</value>
+  </data>
+  <data name="secRunCommand.Text" xml:space="preserve">
+    <value>Remove "Run" Command</value>
+  </data>
+  <data name="secScreenSaver.Text" xml:space="preserve">
+    <value>Disable Screen Saver</value>
+  </data>
+  <data name="secShutdown.Text" xml:space="preserve">
+    <value>Remove Shutdown and Restart</value>
+  </data>
+  <data name="secTaskManager.Text" xml:space="preserve">
+    <value>Disable Task Manager</value>
+  </data>
+  <data name="secTimeout.Text" xml:space="preserve">
+    <value>Lock Screen Timeout</value>
+  </data>
+  <data name="sekChangeDesktop.Text" xml:space="preserve">
+    <value>Changing Desktop Disabled</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountPolicySettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountPolicySettings.ascx.resx
index 69f57eb1..5dee42e1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountPolicySettings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserAccountPolicySettings.ascx.resx
@@ -147,6 +147,9 @@
   <data name="lnkVpsPolicy.Text" xml:space="preserve">
     <value>Virtual Private Servers Policy</value>
   </data>
+  <data name="lnkRdsPolicy.Text" xml:space="preserve">
+    <value>Remote Desktop Servers Policy</value>
+  </data>
   <data name="lnkWebPolicy.Text" xml:space="preserve">
     <value>WEB Policy</value>
   </data>
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 66d28e5b..6563c74a 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
@@ -166,7 +166,7 @@
     <value>Setup</value>
   </data>
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
-    <value>SharePoint Foundation Server</value>
+    <value>SharePoint Foundation</value>
   </data>
   <data name="Text.SharePointServerGroup" xml:space="preserve">
     <value>SharePoint Server</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx
new file mode 100644
index 00000000..5b860eef
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx
@@ -0,0 +1,131 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SettingsRdsPolicy.ascx.cs" Inherits="WebsitePanel.Portal.SettingsRdsPolicy" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="UserControls/CollapsiblePanel.ascx" %>
+
+<wsp:CollapsiblePanel id="secTimeout" runat="server" TargetControlID="timeoutPanel" meta:resourcekey="secTimeout" Text="Lock Screen Timeout"/>
+<asp:Panel ID="timeoutPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>            
+            <td colspan="2">
+                <asp:TextBox ID="txtTimeout" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+            </td>            
+        </tr>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbTimeoutUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbTimeoutAdministrators" Checked="false" />
+            </td>
+        </tr>
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secRunCommand" runat="server" TargetControlID="runCommandPanel" meta:resourcekey="secRunCommand" Text="Remove Run Command"/>
+<asp:Panel ID="runCommandPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbRunCommandUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbRunCommandAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secPowershellCommand" runat="server" TargetControlID="powershellCommandPanel" meta:resourcekey="secPowershellCommand" Text="Remove Powershell Command"/>
+<asp:Panel ID="powershellCommandPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbPowershellUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbPowershellAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secHideCDrive" runat="server" TargetControlID="hideCDrivePanel" meta:resourcekey="secHideCDrive" Text="Hide C: Drive"/>
+<asp:Panel ID="hideCDrivePanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbHideCDriveUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbHideCDriveAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secShutdown" runat="server" TargetControlID="shutdownPanel" meta:resourcekey="secShutdown" Text="Remove Shutdown and Restart"/>
+<asp:Panel ID="shutdownPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbShutdownUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbShutdownAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secTaskManager" runat="server" TargetControlID="taskManagerPanel" meta:resourcekey="secTaskManager" Text="Disable Task Manager"/>
+<asp:Panel ID="taskManagerPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbTaskManagerUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbTaskManagerAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secChangeDesktop" runat="server" TargetControlID="desktopPanel" meta:resourcekey="secChangeDesktop" Text="Changing Desktop Disabled"/>
+<asp:Panel ID="desktopPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbDesktopUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbDesktopAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secScreenSaver" runat="server" TargetControlID="screenSaverPanel" meta:resourcekey="secScreenSaver" Text="Disable Screen Saver"/>
+<asp:Panel ID="screenSaverPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbScreenSaverUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbScreenSaverAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secDriveSpace" runat="server" TargetControlID="driveSpacePanel" meta:resourcekey="secDriveSpace" Text="Drive Space Threshold"/>
+<asp:Panel ID="driveSpacePanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>            
+            <td colspan="2">
+                <asp:TextBox ID="txtThreshold" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs
new file mode 100644
index 00000000..186ce217
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal
+{
+    public partial class SettingsRdsPolicy : WebsitePanelControlBase, IUserSettingsEditorControl
+    {
+        private const string LOCK_SCREEN_TIMEOUT_VALUE = "LockScreenTimeoutValue";
+        private const string LOCK_SCREEN_TIMEOUT_ADMINISTRATORS = "LockScreenTimeoutAdministrators";
+        private const string LOCK_SCREEN_TIMEOUT_USERS = "LockScreenTimeoutUsers";
+        private const string REMOVE_RUN_COMMAND_ADMINISTRATORS = "RemoveRunCommandAdministrators";
+        private const string REMOVE_RUN_COMMAND_USERS = "RemoveRunCommandUsers";
+        private const string REMOVE_POWERSHELL_COMMAND_ADMINISTRATORS = "RemovePowershellCommandAdministrators";
+        private const string REMOVE_POWERSHELL_COMMAND_USERS = "RemovePowershellCommandUsers";
+        private const string HIDE_C_DRIVE_ADMINISTRATORS = "HideCDriveAdministrators";
+        private const string HIDE_C_DRIVE_USERS = "HideCDriveUsers";
+        private const string REMOVE_SHUTDOWN_RESTART_ADMINISTRATORS = "RemoveShutdownRestartAdministrators";
+        private const string REMOVE_SHUTDOWN_RESTART_USERS = "RemoveShutdownRestartUsers";
+        private const string DISABLE_TASK_MANAGER_ADMINISTRATORS = "DisableTaskManagerAdministrators";
+        private const string DISABLE_TASK_MANAGER_USERS = "DisableTaskManagerUsers";
+        private const string CHANGE_DESKTOP_DISABLED_ADMINISTRATORS = "ChangingDesktopDisabledAdministrators";
+        private const string CHANGE_DESKTOP_DISABLED_USERS = "ChangingDesktopDisabledUsers";
+        private const string SCREEN_SAVER_DISABLED_ADMINISTRATORS = "ScreenSaverDisabledAdministrators";
+        private const string SCREEN_SAVER_DISABLED_USERS = "ScreenSaverDisabledUsers";
+        private const string DRIVE_SPACE_THRESHOLD_VALUE = "DriveSpaceThresholdValue";
+
+        public void BindSettings(UserSettings settings)
+        {            
+            txtTimeout.Text = settings[LOCK_SCREEN_TIMEOUT_VALUE];
+            cbTimeoutAdministrators.Checked = Convert.ToBoolean(settings[LOCK_SCREEN_TIMEOUT_ADMINISTRATORS]);
+            cbTimeoutUsers.Checked = Convert.ToBoolean(settings[LOCK_SCREEN_TIMEOUT_USERS]);
+
+            cbRunCommandAdministrators.Checked = Convert.ToBoolean(settings[REMOVE_RUN_COMMAND_ADMINISTRATORS]);
+            cbRunCommandUsers.Checked = Convert.ToBoolean(settings[REMOVE_RUN_COMMAND_USERS]);
+
+            cbPowershellAdministrators.Checked = Convert.ToBoolean(settings[REMOVE_POWERSHELL_COMMAND_ADMINISTRATORS]);
+            cbPowershellUsers.Checked = Convert.ToBoolean(settings[REMOVE_POWERSHELL_COMMAND_USERS]);
+
+            cbHideCDriveAdministrators.Checked = Convert.ToBoolean(settings[HIDE_C_DRIVE_ADMINISTRATORS]);
+            cbHideCDriveUsers.Checked = Convert.ToBoolean(settings[HIDE_C_DRIVE_USERS]);
+
+            cbShutdownAdministrators.Checked = Convert.ToBoolean(settings[REMOVE_SHUTDOWN_RESTART_ADMINISTRATORS]);
+            cbShutdownUsers.Checked = Convert.ToBoolean(settings[REMOVE_SHUTDOWN_RESTART_USERS]);
+
+            cbTaskManagerAdministrators.Checked = Convert.ToBoolean(settings[DISABLE_TASK_MANAGER_ADMINISTRATORS]);
+            cbTaskManagerUsers.Checked = Convert.ToBoolean(settings[DISABLE_TASK_MANAGER_USERS]);
+
+            cbDesktopAdministrators.Checked = Convert.ToBoolean(settings[CHANGE_DESKTOP_DISABLED_ADMINISTRATORS]);
+            cbDesktopUsers.Checked = Convert.ToBoolean(settings[CHANGE_DESKTOP_DISABLED_USERS]);
+
+            cbScreenSaverAdministrators.Checked = Convert.ToBoolean(settings[SCREEN_SAVER_DISABLED_ADMINISTRATORS]);
+            cbScreenSaverUsers.Checked = Convert.ToBoolean(settings[SCREEN_SAVER_DISABLED_USERS]);
+
+            txtThreshold.Text = settings[DRIVE_SPACE_THRESHOLD_VALUE];
+        }
+
+        public void SaveSettings(UserSettings settings)
+        {
+            settings[LOCK_SCREEN_TIMEOUT_VALUE] = txtTimeout.Text;
+            settings[LOCK_SCREEN_TIMEOUT_ADMINISTRATORS] = cbTimeoutAdministrators.Checked.ToString();
+            settings[LOCK_SCREEN_TIMEOUT_USERS] = cbTimeoutUsers.Checked.ToString();
+            settings[REMOVE_RUN_COMMAND_ADMINISTRATORS] = cbRunCommandAdministrators.Checked.ToString();
+            settings[REMOVE_RUN_COMMAND_USERS] = cbRunCommandUsers.Checked.ToString();
+            settings[REMOVE_POWERSHELL_COMMAND_ADMINISTRATORS] = cbPowershellAdministrators.Checked.ToString();
+            settings[REMOVE_POWERSHELL_COMMAND_USERS] = cbPowershellUsers.Checked.ToString();
+            settings[HIDE_C_DRIVE_ADMINISTRATORS] = cbHideCDriveAdministrators.Checked.ToString();
+            settings[HIDE_C_DRIVE_USERS] = cbHideCDriveUsers.Checked.ToString();
+            settings[REMOVE_SHUTDOWN_RESTART_ADMINISTRATORS] = cbShutdownAdministrators.Checked.ToString();
+            settings[REMOVE_SHUTDOWN_RESTART_USERS] = cbShutdownUsers.Checked.ToString();
+            settings[DISABLE_TASK_MANAGER_ADMINISTRATORS] = cbTaskManagerAdministrators.Checked.ToString();
+            settings[DISABLE_TASK_MANAGER_USERS] = cbTaskManagerUsers.Checked.ToString();
+            settings[CHANGE_DESKTOP_DISABLED_ADMINISTRATORS] = cbDesktopAdministrators.Checked.ToString();
+            settings[CHANGE_DESKTOP_DISABLED_USERS] = cbDesktopUsers.Checked.ToString();
+            settings[SCREEN_SAVER_DISABLED_ADMINISTRATORS] = cbScreenSaverAdministrators.Checked.ToString();
+            settings[SCREEN_SAVER_DISABLED_USERS] = cbScreenSaverUsers.Checked.ToString();
+            settings[DRIVE_SPACE_THRESHOLD_VALUE] = txtThreshold.Text;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs
new file mode 100644
index 00000000..ab5d3f15
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs
@@ -0,0 +1,339 @@
+//------------------------------------------------------------------------------
+// <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 {
+    
+    
+    public partial class SettingsRdsPolicy {
+        
+        /// <summary>
+        /// secTimeout control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secTimeout;
+        
+        /// <summary>
+        /// timeoutPanel 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 timeoutPanel;
+        
+        /// <summary>
+        /// txtTimeout 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 txtTimeout;
+        
+        /// <summary>
+        /// cbTimeoutUsers 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.CheckBox cbTimeoutUsers;
+        
+        /// <summary>
+        /// cbTimeoutAdministrators 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.CheckBox cbTimeoutAdministrators;
+        
+        /// <summary>
+        /// secRunCommand control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secRunCommand;
+        
+        /// <summary>
+        /// runCommandPanel 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 runCommandPanel;
+        
+        /// <summary>
+        /// cbRunCommandUsers 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.CheckBox cbRunCommandUsers;
+        
+        /// <summary>
+        /// cbRunCommandAdministrators 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.CheckBox cbRunCommandAdministrators;
+        
+        /// <summary>
+        /// secPowershellCommand control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secPowershellCommand;
+        
+        /// <summary>
+        /// powershellCommandPanel 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 powershellCommandPanel;
+        
+        /// <summary>
+        /// cbPowershellUsers 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.CheckBox cbPowershellUsers;
+        
+        /// <summary>
+        /// cbPowershellAdministrators 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.CheckBox cbPowershellAdministrators;
+        
+        /// <summary>
+        /// secHideCDrive control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secHideCDrive;
+        
+        /// <summary>
+        /// hideCDrivePanel 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 hideCDrivePanel;
+        
+        /// <summary>
+        /// cbHideCDriveUsers 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.CheckBox cbHideCDriveUsers;
+        
+        /// <summary>
+        /// cbHideCDriveAdministrators 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.CheckBox cbHideCDriveAdministrators;
+        
+        /// <summary>
+        /// secShutdown control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secShutdown;
+        
+        /// <summary>
+        /// shutdownPanel 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 shutdownPanel;
+        
+        /// <summary>
+        /// cbShutdownUsers 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.CheckBox cbShutdownUsers;
+        
+        /// <summary>
+        /// cbShutdownAdministrators 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.CheckBox cbShutdownAdministrators;
+        
+        /// <summary>
+        /// secTaskManager control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secTaskManager;
+        
+        /// <summary>
+        /// taskManagerPanel 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 taskManagerPanel;
+        
+        /// <summary>
+        /// cbTaskManagerUsers 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.CheckBox cbTaskManagerUsers;
+        
+        /// <summary>
+        /// cbTaskManagerAdministrators 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.CheckBox cbTaskManagerAdministrators;
+        
+        /// <summary>
+        /// secChangeDesktop control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secChangeDesktop;
+        
+        /// <summary>
+        /// desktopPanel 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 desktopPanel;
+        
+        /// <summary>
+        /// cbDesktopUsers 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.CheckBox cbDesktopUsers;
+        
+        /// <summary>
+        /// cbDesktopAdministrators 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.CheckBox cbDesktopAdministrators;
+        
+        /// <summary>
+        /// secScreenSaver control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secScreenSaver;
+        
+        /// <summary>
+        /// screenSaverPanel 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 screenSaverPanel;
+        
+        /// <summary>
+        /// cbScreenSaverUsers 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.CheckBox cbScreenSaverUsers;
+        
+        /// <summary>
+        /// cbScreenSaverAdministrators 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.CheckBox cbScreenSaverAdministrators;
+        
+        /// <summary>
+        /// secDriveSpace control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDriveSpace;
+        
+        /// <summary>
+        /// driveSpacePanel 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 driveSpacePanel;
+        
+        /// <summary>
+        /// txtThreshold 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 txtThreshold;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx
index 1ea55968..89b1b10b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx
@@ -63,6 +63,10 @@
             <asp:HyperLink ID="lnkVpsPolicy" runat="server" meta:resourcekey="lnkVpsPolicy"
                     Text="Virtual Private Servers Policy" NavigateUrl='<%# GetSettingsLink("VpsPolicy", "SettingsVpsPolicy") %>'></asp:HyperLink>
         </li>
+        <li>
+            <asp:HyperLink ID="lnkRdsPolicy" runat="server" meta:resourcekey="lnkRdsPolicy"
+                    Text="Remote Desktop Servers Policy" NavigateUrl='<%# GetSettingsLink("RdsPolicy", "SettingsRdsPolicy") %>'></asp:HyperLink>
+        </li>
     </ul>
 </div>
 <div class="FormFooter">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx.designer.cs
index 708f59a5..4f52623a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountPolicySettings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -175,6 +147,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink lnkVpsPolicy;
         
+        /// <summary>
+        /// lnkRdsPolicy 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.HyperLink lnkRdsPolicy;
+        
         /// <summary>
         /// btnCancel control.
         /// </summary>
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 06ce4377..ea79a622 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -517,6 +517,13 @@
     <Compile Include="SettingsDomainLookupLetter.ascx.designer.cs">
       <DependentUpon>SettingsDomainLookupLetter.ascx</DependentUpon>
     </Compile>
+    <Compile Include="SettingsRdsPolicy.ascx.cs">
+      <DependentUpon>SettingsRdsPolicy.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="SettingsRdsPolicy.ascx.designer.cs">
+      <DependentUpon>SettingsRdsPolicy.ascx</DependentUpon>
+    </Compile>
     <Compile Include="SettingsRdsSetupLetter.ascx.cs">
       <DependentUpon>SettingsRdsSetupLetter.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4558,6 +4565,7 @@
     <Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx" />
     <Content Include="ExchangeServer\UserControls\App_LocalResources\EnterpriseStorageOwaUsersList.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageFolderSettingsOwaEditing.ascx.resx" />
+    <Content Include="App_LocalResources\SettingsRdsPolicy.ascx.resx" />
     <EmbeddedResource Include="RDS\App_LocalResources\RDSEditCollectionSettings.ascx.resx" />
     <Content Include="RDSServersEditServer.ascx" />
     <Content Include="RDS\AssignedRDSServers.ascx" />
@@ -4604,6 +4612,7 @@
     <Content Include="ScheduleTaskControls\DomainLookupView.ascx" />
     <Content Include="SettingsDomainExpirationLetter.ascx" />
     <Content Include="SettingsDomainLookupLetter.ascx" />
+    <Content Include="SettingsRdsPolicy.ascx" />
     <Content Include="SettingsRdsSetupLetter.ascx" />
     <Content Include="SettingsServiceLevels.ascx" />
     <Content Include="CRM\CRMStorageSettings.ascx" />