diff --git a/dist/install/windows/x64/standalone.iss b/dist/install/windows/x64/standalone.iss
index e096055c..8f039374 100644
--- a/dist/install/windows/x64/standalone.iss
+++ b/dist/install/windows/x64/standalone.iss
@@ -46,12 +46,12 @@ Source: "C:\data\code\raven\dist\win-x64\ayanova\standalone\*"; DestDir: "{app}"
 Source: "C:\data\code\raven\dist\win-x64\launcher\config.json"; DestDir: "{app}"; Flags: ignoreversion confirmoverwrite
 Source: "C:\data\code\raven\dist\win-x64\launcher\*"; DestDir: "{app}\launcher"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "C:\data\code\raven\dist\win-x64\postgres-standalone\*"; DestDir: "{app}\local-postgres"; Permissions: users-modify;Flags: ignoreversion recursesubdirs createallsubdirs 
-Source: "C:\data\code\raven\dist\win-x64\postgres-empty-database\*"; DestDir: "{commonappdata}\ayanova\database"; Permissions: users-modify; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
+Source: "C:\data\code\raven\dist\win-x64\postgres-empty-database\*"; DestDir: "{commonappdata}\ayanova\database"; Permissions: users-modify; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall
 
 [Dirs]
 Name: "{app}\.local-chromium";Permissions: users-modify;Flags: uninsalwaysuninstall
-Name: "{commonappdata}\ayanova";Permissions: users-modify;
-Name: "{commonappdata}\ayanova\logs";Permissions: users-modify;
+Name: "{commonappdata}\ayanova";Permissions: users-modify;Flags: onlyifdoesntexist uninsneveruninstall
+Name: "{commonappdata}\ayanova\logs";Permissions: users-modify;Flags: onlyifdoesntexist uninsneveruninstall
 
 
 [UninstallDelete]
@@ -69,9 +69,9 @@ procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
   if CurUninstallStep = usPostUninstall then
   begin
-    if MsgBox('Do you want to delete all AyaNova database and attachment files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then   
+    if MsgBox('Do you want to delete all AyaNova database, attachment and log files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then   
     begin
-      if MsgBox('Are you sure you want to **PERMANENTLY** delete all AyaNova database and attachment files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then    
+      if MsgBox('Are you sure you want to **PERMANENTLY** delete all AyaNova data files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then    
       begin
           DelTree(ExpandConstant('{commonappdata}\ayanova'), True, True, True);
       end;