diff --git a/lib/wallet/http.js b/lib/wallet/http.js
index c2b492d2..ded535b4 100644
--- a/lib/wallet/http.js
+++ b/lib/wallet/http.js
@@ -298,7 +298,13 @@ class HTTP extends Server {
     // Get account
     this.get('/wallet/:id/account/:account', async (req, res) => {
       const valid = Validator.fromRequest(req);
-      const acct = valid.str('account');
+      let acct = valid.str('account');
+
+      const num = parseInt(acct);
+
+      if (!Number.isNaN(num))
+        acct = num;
+
       const account = await req.wallet.getAccount(acct);
 
       if (!account) {
diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js
index 8bd68627..5242f758 100644
--- a/lib/wallet/rpc.js
+++ b/lib/wallet/rpc.js
@@ -419,15 +419,23 @@ class RPC extends RPCBase {
 
     const wallet = this.wallet;
     const valid = new Validator(args);
-    let name = valid.str(0, '');
-    const addrs = [];
+    let acct = valid.get(0, 'default');
 
-    if (name === '')
-      name = 'default';
+    if (typeof acct !== 'number' && typeof acct !== 'string') {
+      throw new RPCError(errs.MISC_ERROR,
+                         'Param #0 must be string or number.');
+    }
+
+    const num = parseInt(acct);
+
+    if (!Number.isNaN(num))
+      acct = num;
+
+    const addrs = [];
 
     let paths;
     try {
-      paths = await wallet.getPaths(name);
+      paths = await wallet.getPaths(acct);
     } catch (e) {
       if (e.message === 'Account not found.')
         return [];
diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js
index a3e770e6..770edfed 100644
--- a/lib/wallet/wallet.js
+++ b/lib/wallet/wallet.js
@@ -934,7 +934,8 @@ class Wallet extends EventEmitter {
     const hashes = await this.getAccountHashes(index);
     const name = await this.getAccountName(acct);
 
-    assert(name);
+    if (name == null)
+      throw new Error('Account not found.');
 
     const result = [];