diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c
index d88181897..f68752913 100644
--- a/lightningd/bitcoind.c
+++ b/lightningd/bitcoind.c
@@ -117,8 +117,14 @@ static char *bcli_args(const tal_t *ctx, struct bitcoin_cli *bcli)
 	char *ret = tal_strdup(ctx, bcli->args[0]);
 
 	for (i = 1; bcli->args[i]; i++) {
-		ret = tal_strcat(ctx, take(ret), " ");
-		ret = tal_strcat(ctx, take(ret), bcli->args[i]);
+            ret = tal_strcat(ctx, take(ret), " ");
+            if (strstarts(bcli->args[i], "-rpcpassword")) {
+                    ret = tal_strcat(ctx, take(ret), "-rpcpassword=...");
+            } else if (strstarts(bcli->args[i], "-rpcuser")) {
+                    ret = tal_strcat(ctx, take(ret), "-rpcuser=...");
+            } else {
+                ret = tal_strcat(ctx, take(ret), bcli->args[i]);
+            }
 	}
 	return ret;
 }