diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index f80c15ab05b75..3ef1be0bb5ba4 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1180,6 +1180,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
     if (strMethod == "listtransactions"       && n > 2) ConvertTo<boost::int64_t>(params[2]);
     if (strMethod == "listaccounts"           && n > 0) ConvertTo<boost::int64_t>(params[0]);
     if (strMethod == "walletpassphrase"       && n > 1) ConvertTo<boost::int64_t>(params[1]);
+    if (strMethod == "walletpassphrase"       && n > 2) ConvertTo<bool>(params[2]);
     if (strMethod == "getblocktemplate"       && n > 0) ConvertTo<Object>(params[0]);
     if (strMethod == "listsinceblock"         && n > 1) ConvertTo<boost::int64_t>(params[1]);
     if (strMethod == "sendmany"               && n > 1) ConvertTo<Object>(params[1]);
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index a1ebcffa49f8a..f36f62ee3893f 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -1354,7 +1354,7 @@ Value walletpassphrase(const Array& params, bool fHelp)
 {
     if (pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 3))
         throw runtime_error(
-            "walletpassphrase <passphrase> <timeout> [anonymizenonly]\n"
+            "walletpassphrase <passphrase> <timeout> [anonymizenonly=false]\n"
             "Stores the wallet decryption key in memory for <timeout> seconds.\n"
             "if [anonymizeonly] is true sending functions are disabled.");
     if (fHelp)
@@ -1388,7 +1388,7 @@ Value walletpassphrase(const Array& params, bool fHelp)
     }
     else
         throw runtime_error(
-                "walletpassphrase <passphrase> <timeout> [anonymizeonly]\n"
+                "walletpassphrase <passphrase> <timeout> [anonymizeonly=false]\n"
                 "Stores the wallet decryption key in memory for <timeout> seconds.\n"
                 "if [anonymizeonly] is true sending functions are disabled.");