diff --git a/keystone/common/config.py b/keystone/common/config.py
index 34ab098876..24ce8115cb 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -223,9 +223,9 @@
     'auth': [
         cfg.ListOpt('methods', default=_DEFAULT_AUTH_METHODS),
         cfg.StrOpt('password',
-                   default='keystone.auth.plugins.token.Token'),
-        cfg.StrOpt('token',
                    default='keystone.auth.plugins.password.Password'),
+        cfg.StrOpt('token',
+                   default='keystone.auth.plugins.token.Token'),
         #deals with REMOTE_USER authentication
         cfg.StrOpt('external',
                    default='keystone.auth.plugins.external.ExternalDefault')],
diff --git a/keystone/tests/test_config.py b/keystone/tests/test_config.py
index 28b372a63c..218961f9d4 100644
--- a/keystone/tests/test_config.py
+++ b/keystone/tests/test_config.py
@@ -17,3 +17,9 @@ def test_paste_config(self):
         self.opt_in_group('paste_deploy', config_file='')
         self.assertEqual(config.find_paste_config(),
                          test.etcdir('keystone.conf.sample'))
+
+    def test_config_default(self):
+        self.assertEqual('keystone.auth.plugins.password.Password',
+                         CONF.auth.password)
+        self.assertEqual('keystone.auth.plugins.token.Token',
+                         CONF.auth.token)