diff --git a/lib/geth_commands.js b/lib/geth_commands.js
index 9b81fd7b..fdb7cef3 100644
--- a/lib/geth_commands.js
+++ b/lib/geth_commands.js
@@ -54,6 +54,8 @@ GethCommands.prototype.listAccountsCommand = function() {
     cmd += "--testnet ";
   } else if (config.networkType === 'olympic') {
     cmd += "--olympic ";
+  } else if (config.networkType === 'custom') {
+    cmd += "--networkid " + config.networkId + " ";
   }
 
   if (config.datadir) {
@@ -80,9 +82,7 @@ GethCommands.prototype.mainCommand = function(address) {
     cmd += "--testnet ";
   } else if (config.networkType === 'olympic') {
     cmd += "--olympic ";
-  }
-
-  if (config.networkType === 'custom') {
+  } else if (config.networkType === 'custom') {
     cmd += "--networkid " + config.networkId + " ";
   }