diff --git a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
index 2e5e2278228e2e872067be770ef3573269ad18bd..2f0aa085ef712b27c8ddd0a9ba7e511b56178b20 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
@@ -465,6 +465,7 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
                 logWriter.write(cmdString.toString());
 
                 logWriter.write("Task '" + task.getName() + "' started at " + new Date() + lf);
+                logWriter.flush();
 
                 InputStream in = input;
                 try (Reader reader = new InputStreamReader(in, GeneralUtils.getDefaultConsoleEncoding())) {
@@ -494,6 +495,7 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
             } finally {
                 try {
                     logWriter.write("Task '" + task.getName() + "' finished at " + new Date() + lf);
+                    logWriter.flush();
                 } catch (IOException e) {
                     // ignore
                 }
diff --git a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/NativeToolUtils.java b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/NativeToolUtils.java
index cb5c42e59418ecf3f34f2e5d5cacb3c806a57101..eff11a7783bfe4bc55e247ec9adc94595041e842 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/NativeToolUtils.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/NativeToolUtils.java
@@ -13,8 +13,8 @@ public abstract class NativeToolUtils {
     public static boolean isSecureString(AbstractNativeToolSettings settings, String string) {
         String userPassword = settings.getDataSourceContainer().getActualConnectionConfiguration().getUserPassword();
         String toolUserPassword = settings.getToolUserPassword();
-        return !CommonUtils.isEmpty(toolUserPassword) && string.contains(toolUserPassword) ||
-            !CommonUtils.isEmpty(userPassword) && string.contains(userPassword);
+        return !CommonUtils.isEmpty(toolUserPassword) && string.endsWith(toolUserPassword) ||
+            !CommonUtils.isEmpty(userPassword) && string.endsWith(userPassword);
     }
 
 }