diff --git a/lib/mpw/cli.rb b/lib/mpw/cli.rb
index 0a5dcde..12bbe22 100644
--- a/lib/mpw/cli.rb
+++ b/lib/mpw/cli.rb
@@ -61,7 +61,7 @@ class Cli
 
 		I18n.locale = lang.to_sym
 
-		@config.setup(options[:gpg_key], lang, options[:wallet_dir], options[:gpg_exe])
+		@config.setup(options[:gpg_key], lang, options[:wallet_dir], options[:default_wallet], options[:gpg_exe])
 
 		load_config
 
diff --git a/test/test_config.rb b/test/test_config.rb
index 3de438c..5e4e721 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -27,7 +27,7 @@ class TestConfig < Test::Unit::TestCase
 		       }
 
 		@config = MPW::Config.new
-		@config.setup(data[:key], data[:lang], data[:wallet_dir], data[:gpg_exe])
+		@config.setup(data[:key], data[:lang], data[:wallet_dir], nil, data[:gpg_exe])
 		@config.load_config
 
 		data.each do |k,v|