diff --git a/electrum b/electrum
index d9fd3e31..96fe6e8f 100755
--- a/electrum
+++ b/electrum
@@ -372,9 +372,6 @@ if __name__ == '__main__':
     elif cmd == 'createrawtransaction':
         args = [ cmd, ast.literal_eval(args[1]), ast.literal_eval(args[2])]
 
-    elif cmd == 'dumpprivkeys':
-        args = [cmd, wallet.all_addresses() if options.show_all else wallet.addresses + wallet.imported_keys.keys() ]
-
     elif cmd=='addresses':
         args = [cmd, options.show_all]
                 
diff --git a/lib/commands.py b/lib/commands.py
index c8a18374..50cd07c0 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -216,7 +216,9 @@ class Commands:
     def dumpprivkey(self, addr):
         return self.wallet.get_private_key(addr, self.password)
 
-    def dumpprivkeys(self, addresses):
+    def dumpprivkeys(self, addresses = None):
+        if addresses is None:
+            addresses = self.wallet.all_addresses()
         return self.wallet.get_private_keys(addresses, self.password)
 
     def validateaddress(self,addr):