diff --git a/salt/config.py b/salt/config.py
index 09ed2a26b2..fb3a66f28a 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -340,13 +340,13 @@ def master_config(path):
     return opts
 
 
-def client_config(mdir):
+def client_config(path):
     '''
     Load in the configuration data needed for the LocalClient. This function
     searches for client specific configurations and adds them to the data from
     the master configuration.
     '''
-    opts = master_config(mdir)
+    opts = master_config(path)
     cpath = os.path.expanduser('~/.salt')
     load_config(opts, cpath, 'SALT_CLIENT_CONFIG')
     if 'token_file' in opts:
diff --git a/salt/utils/parsers.py b/salt/utils/parsers.py
index 3d1c228a60..f25977b491 100644
--- a/salt/utils/parsers.py
+++ b/salt/utils/parsers.py
@@ -753,7 +753,7 @@ class SaltCMDOptionParser(OptionParser, ConfigDirMixIn, TimeoutMixIn,
                 self.config['arg'] = self.args[2:]
 
     def setup_config(self):
-        return config.master_config(self.get_config_file_path('master'))
+        return config.client_config(self.get_config_file_path('master'))
 
 
 class SaltCPOptionParser(OptionParser, ConfigDirMixIn, TimeoutMixIn,