diff --git a/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java b/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
index 25753194..0b10b138 100644
--- a/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
+++ b/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
@@ -357,7 +357,7 @@ public final class CoreMoneroConnectionsService {
 
             @Override
             public void onPasswordChanged(String oldPassword, String newPassword) {
-                log.info(getClass() + ".onPasswordChanged({}, {}) called", oldPassword, newPassword);
+                log.info(getClass() + ".onPasswordChanged({}, {}) called", oldPassword == null ? null : "***", newPassword == null ? null : "***");
                 connectionList.changePassword(oldPassword, newPassword);
             }
         });
diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
index 0e869b59..12d1798f 100644
--- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
+++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -904,6 +904,7 @@ public class XmrWalletService {
 
         // excute tasks in parallel
         HavenoUtils.executeTasks(tasks, Math.min(10, 1 + trades.size()));
+        log.info("Done changing all wallet passwords");
     }
 
     private void closeMainWallet(boolean save) {