diff --git a/doc/source/install.rst b/doc/source/install.rst
index ccd5b8cc..e5414fee 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -181,10 +181,11 @@ loaded roles.
 Keystone Configuration
 ----------------------
 
-By default, Tuskar is configured to authenticate with Keystone
-for REST API calls. For development, Keystone authentication can
-be disabled by updating the ``tuskar.conf`` and changing the
-``auth_strategy`` to equal ``noauth ``.
+By default, Tuskar is configured to skip authentication for REST
+API calls. Keystone authentication can be enabled by making the
+appropriate changes to the ``tuskar.conf`` file as described in
+the `keystone documentation <http://docs.openstack.org/developer/
+keystone/configuringservices.html>`_
 
 
 Contributing
diff --git a/etc/tuskar/tuskar.conf.sample b/etc/tuskar/tuskar.conf.sample
index edbde1be..bbb1e859 100644
--- a/etc/tuskar/tuskar.conf.sample
+++ b/etc/tuskar/tuskar.conf.sample
@@ -29,8 +29,8 @@
 # Options defined in tuskar.api.app
 #
 
-# Method to use for auth: keystone or noauth. (string value)
-#auth_strategy=keystone
+# Method to use for auth: noauth or keystone. (string value)
+#auth_strategy=noauth
 
 
 #
diff --git a/tuskar/api/app.py b/tuskar/api/app.py
index cc4491b6..d9b6c9ec 100644
--- a/tuskar/api/app.py
+++ b/tuskar/api/app.py
@@ -25,8 +25,8 @@ from tuskar.api import renderers
 auth_opts = [
     cfg.StrOpt(
         'auth_strategy',
-        default='keystone',
-        help='Method to use for auth: keystone or noauth.'),
+        default='noauth',
+        help='Method to use for auth: noauth or keystone.'),
 ]
 
 CONF = cfg.CONF