diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 6151ddbd6..f9d13db0c 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -281,8 +281,8 @@ sub windows_account_data {
 	if ($passtab) {
 		my $passent = $passtab->getAttribs({key=>"system",username=>"Administrator"},['password']);
 		if ($passent and $passent->{password}) {
-			$useraccountxml="<AdministratorPassword>\n<Value>".$passent->{password}."</Value>\n<PlainText>true</PlainText>\n</AdministratorPassword>\n";
-			$useraccountxml.="<!-- Plaintext=false would only protect against the most cursory over the shoulder glance, this implementation opts not to even give the illusion of privacy by only doing plaintext. -->\n";
+			$useraccountxml="<AdministratorPassword>\r\n<Value>".$passent->{password}."</Value>\r\n<PlainText>true</PlainText>\r\n</AdministratorPassword>\r\n";
+			$useraccountxml.="<!-- Plaintext=false would only protect against the most cursory over the shoulder glance, this implementation opts not to even give the illusion of privacy by only doing plaintext. -->\r\n";
 			$localadminenabled=1;
 		}
 	}
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 4df730aed..10c3269aa 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
@@ -74,10 +74,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
index 8c7fcbb8b..d203e99dc 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
@@ -86,10 +86,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
index 5503e9688..a0049a129 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
@@ -73,10 +73,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
index c483f6b7e..0f7325dbb 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
@@ -83,10 +83,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>
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 b4acfd446..e9ed7bf3c 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
@@ -74,10 +74,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
index ba8a33645..34e4737a8 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
@@ -84,10 +84,7 @@
 	        <FirstLogonCommands>
             </FirstLogonCommands>
             <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
+		#WINACCOUNTDATA#
             </UserAccounts>
         </component>
     </settings>