2 files changed, 15 insertions, 9 deletions

diff --git a/src/ext/Util/ca/scaexec.cpp b/src/ext/Util/ca/scaexec.cpp
index ee3c164f..2baab86e 100644
--- a/src/ext/Util/ca/scaexec.cpp
+++ b/src/ext/Util/ca/scaexec.cpp
@@ -764,6 +764,7 @@ extern "C" UINT __stdcall CreateUser(
     WCA_CASCRIPT_HANDLE hRollbackScript = NULL;
     int iOriginalAttributes = 0;
     int iRollbackAttributes = 0;
+    LPCWSTR wzOriginalComment = NULL;
 
     USER_INFO_1 userInfo1;
     USER_INFO_1* pUserInfo1 = NULL;
@@ -885,14 +886,16 @@ extern "C" UINT __stdcall CreateUser(
                                 }
                             }
 
-                            hr = WcaCaScriptWriteString(hRollbackScript, pUserInfo1->usri1_comment);
-                            ExitOnFailure(hr, "Failed to add rollback comment to rollback script.");
-
-                            if (!pUserInfo1->usri1_comment || !*pUserInfo1->usri1_comment)
+                            wzOriginalComment = pUserInfo1->usri1_comment;
+                            if (!wzOriginalComment || !*wzOriginalComment)
                             {
                                 iRollbackAttributes |= SCAU_REMOVE_COMMENT;
+                                wzOriginalComment = L"";
                             }
 
+                            hr = WcaCaScriptWriteString(hRollbackScript, wzOriginalComment);
+                            ExitOnFailure(hr, "Failed to add rollback comment to rollback script.");
+
                             hr = WcaCaScriptWriteNumber(hRollbackScript, iRollbackAttributes);
                             ExitOnFailure(hr, "Failed to add rollback attributes to rollback script.");
 
@@ -1247,6 +1250,7 @@ extern "C" UINT __stdcall CreateGroup(
 
     WCA_CASCRIPT_HANDLE hRollbackScript = NULL;
     int iRollbackAttributes = 0;
+    LPCWSTR wzOriginalComment = NULL;
 
     DWORD dw;
     LPWSTR pwzServerName = NULL;
@@ -1338,14 +1342,16 @@ extern "C" UINT __stdcall CreateGroup(
 
                             iRollbackAttributes = 0;
 
-                            hr = WcaCaScriptWriteString(hRollbackScript, pGroupInfo1->lgrpi1_comment);
-                            ExitOnFailure(hr, "Failed to add rollback comment to rollback script.");
-
-                            if (!pGroupInfo1->lgrpi1_comment || !*pGroupInfo1->lgrpi1_comment)
+                            wzOriginalComment = pGroupInfo1->lgrpi1_comment;
+                            if (!wzOriginalComment || !*wzOriginalComment)
                             {
                                 iRollbackAttributes |= SCAG_REMOVE_COMMENT;
+                                wzOriginalComment = L"";
                             }
 
+                            hr = WcaCaScriptWriteString(hRollbackScript, wzOriginalComment);
+                            ExitOnFailure(hr, "Failed to add rollback comment to rollback script.");
+
                             hr = WcaCaScriptWriteNumber(hRollbackScript, iRollbackAttributes);
                             ExitOnFailure(hr, "Failed to add rollback attributes to rollback script.");
 
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index 5dbe2792..e7cbc372 100644
--- a/src/ext/Util/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>