diff --git a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
index 2a7be74be..2e02bc3f8 100644
--- a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
@@ -85,9 +85,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
index 476c6789b..7a1b8ac10 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
@@ -86,9 +86,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
index 7a90b4e27..c63cf0802 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
@@ -93,9 +93,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
index 119b3a8d5..8aa88c41a 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
@@ -88,9 +88,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
index e5fce6997..cb2a790eb 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
@@ -101,9 +101,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
index 71cd0da07..84c1f02f8 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
@@ -86,9 +86,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
index 0f1544a48..b2bf083d2 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
@@ -93,9 +93,6 @@
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
         <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64"  publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <FirewallGroups>
                 <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">